Feature command additions

Making PR so I can see what didn't get committed on a local branch I accidentally made -_-
I changed this method a bit yesterday to make it more flexible, may want to merge in the latest develop and update before merging