Finished mechanics controller, reworked master templating