Command handler and parser refactoring, new commands and I broken some tests :)