Second Commit. Switched to Mako_Hotplug and a few tweaks. Changes will now be more organized and revertible. This can be assumed as Checkpoint 2 for the XzK.