Add support for running commands, update parsing