Changed commands back into one class.