Need to update

TODO: get it to grab only one command at a time