Refactoring
Can disable commands
Test passing
Travis