Refactoring Commands (IN PROGRESS)

Trying to get it, so we can easily implement any new commands.