Added string parser and removed all command checking