Refactored and removed the CommandInterface stuff