* remove ICommand back to Command
* remove @properties in favor of setters/getters