Revamped command system

Implementation of the new system is not yet complete