Finish up Command module, now onto the rest