Started working on some more advanced command functionality