Start on commandParser re-write