Begin rewrite of command system