[PATCH] Add basic command parsing