Initial hack at fixing the command parsing. WIP