Added Command object, more random stuff