Overhaul command system to be cleaner/less buggy