Need to add a timer for commands
Adding support for more commands
Merged with A Laberge