(WIP) Feature command additions

Making PR so I can see what didn't get committed on a local branch I accidentally made -_-