Added basic command parser
Trailing edits