Revert "Revert "Moved machine gui registration to the client""

This reverts commit 93c36c4294032d4cdbc69dde5ac02a2561560e90.
Revert "Revert "I should test my changes before I commit""

This reverts commit e47279c8f86bb621adf60c1aefccc3c37f40ef11.