Implemented first round of command parsing