diff --git a/connection.capnp b/connection.capnp
index 84bc94c..6640c3c 100644
--- a/connection.capnp
+++ b/connection.capnp
@@ -23,7 +23,7 @@ interface Bootstrap
 
     permissionSystem @3 () -> ( permissionSystem : PermissionSystem );    
 
-    interactionSystem @4 () -> ( interactionSystem : InteractionSystem );
+    #interactionSystem @4 () -> ( interactionSystem : InteractionSystem );
 
-    federationSystem @5 () -> ( federationSystem : FederationSystem );
+    #federationSystem @5 () -> ( federationSystem : FederationSystem );
 }
\ No newline at end of file
diff --git a/machine.capnp b/machine.capnp
index 938b51b..09657d6 100644
--- a/machine.capnp
+++ b/machine.capnp
@@ -20,8 +20,8 @@ struct Machine {
         reserved @5;
     }
     struct MachineInfoExtended {
-        user @0 :User;
-        transferuser @1 :User;
+        currentUser @0 :User;
+        transferUser @1 :User;
     }
 
     struct Reservation {
@@ -57,10 +57,9 @@ struct Machine {
     inuse @8 :InUse;
     interface InUse $CSharp.name("InUseInterface") {
         giveBack @0 ();
+        sendRawData @1 (data :Data);
 
-        transfer @1 (user: User);
-
-        sendRawData @2 (data :Data);
+        #transfer @2 (user: User);
     }
 
     transfer @9 :Transfer;
diff --git a/machinesystem.capnp b/machinesystem.capnp
index 1001b06..a4a424d 100644
--- a/machinesystem.capnp
+++ b/machinesystem.capnp
@@ -18,10 +18,10 @@ interface MachineSystem
     	getMachine @1 ( uuid :General.UUID ) -> ( machine :Machine);
 	}
 
-	manage @1 () -> ( manage : Manage );
-    interface Manage $CSharp.name("ManageInterface") {
-    	addMachine @0 (machine :Machine);
-    	updateMachine @1 (machine :Machine);
-    	removeMachine @2 (machine :Machine);
-	}
+	#manage @1 () -> ( manage : Manage );
+    #interface Manage $CSharp.name("ManageInterface") {
+    #	addMachine @0 (machine :Machine);
+    #	updateMachine @1 (machine :Machine);
+    #	removeMachine @2 (machine :Machine);
+	#}
 }
\ No newline at end of file
diff --git a/permissionsystem.capnp b/permissionsystem.capnp
index b284687..fbca4be 100644
--- a/permissionsystem.capnp
+++ b/permissionsystem.capnp
@@ -12,11 +12,11 @@ interface PermissionSystem
 {
     info @0 () -> ( info : Info );
     interface Info $CSharp.name("InfoInterface") {
-    	
+    	getRoleList @0 () -> ( role_list :List(Role) );
 	}
 
 	manage @1 () -> ( manage : Manage );
     interface Manage $CSharp.name("ManageInterface") {
-    	getRoleList @0 () -> ( role_list :List(Role) );
+    	
 	}
 }
\ No newline at end of file
diff --git a/user.capnp b/user.capnp
index 31eb3f4..908135d 100644
--- a/user.capnp
+++ b/user.capnp
@@ -21,12 +21,12 @@ struct User
         id @0 :General.UUID;
         firstname @1 :Text;
         lastname @2 :Text;
-        address @3 :Address;
+        #address @3 :Address;
 
-        struct Address
-        { # TODO POST*CODE
-            text @0 :Text;
-        }
+        #struct Address
+        #{ # TODO POST*CODE
+        #    text @0 :Text;
+        #}
     }
 
     info @3 :Info;
@@ -37,13 +37,15 @@ struct User
 
     manage @4 :Manage;
     interface Manage $CSharp.name("ManageInterface") {
-        pwd @0 ( pwd :Text ) -> ();
+        pwd @0 ( old_pwd :Text, new_pwd :Text ) -> ();
     }
 
     admin @5 :Admin;
     interface Admin $CSharp.name("AdminInterface") {
         addRole @0 ( role :Role ) -> ();
         removeRole @1 ( role :Role ) -> ();
+
+        pwd @2 ( new_pwd :Text ) -> ();
     }
 
     cardDESFireEV2 @6 :CardDESFireEV2;
@@ -96,24 +98,22 @@ struct User
         # It is empty but by being access restricted allows the home server to validate the card as
         # being genuine and thus finalizing the authentication of the user.
 
-
-        getTokenList @0 () -> ( tokens :List(Data) );
+        getTokenList @0 () -> ( token_list :List(Data) );
         # Get a list of all user Token currently bound to an user. This will generally be the number
         # of cards they use.
 
-        genCardToken @1 () -> ( token :Data );
-        # Generate a new Token that can be used to access an user in a pseudonymized fashion.
-        # This call is extremely cheap to make as the server will not store this Token.
-
-        bind @2 ( token :Data, auth_key :Data ) -> ();
+        bind @1 ( token :Data, auth_key :Data ) -> ();
         # Bind a given URL to a given auth key. The server will store both URL and key, so using
         # this frequently will force the server to store large amounts of data. 
         # Trying to bind a new key to an existing URL will fail.
 
-        unbind @3 ( token :Data ) -> ();
+        unbind @2 ( token :Data ) -> ();
         # Unbind the key associated with the given token. This will fail all future attempts to use
         # the card with the associated key.
 
+        genCardToken @3 () -> ( token :Data );
+        # Generate a new Token that can be used to access an user in a pseudonymized fashion.
+        # This call is extremely cheap to make as the server will not store this Token.
 
         getMetaInfo @4 () -> ( bytes :Data );
         # Retrieve the blob for File 0001 from the server. The returned bytes are in the correct