I'd say it's fairly grand now there are udoable command and normal command. The whole tower factory can be scrapped if ye want cause right now seems pointless.

You shouldn't push these changes at all. 
Try taking them out of the pull request.