Removed old code, started new  approach for command parsing
TODO Comment