More work on commandParser