Added command, cleaned up code, etc. etc.