Added basic parsing of single commands