Study Features to Staging

@kadst43 @eric79 

I had to do a bit of merge conflict handling, so a healthy amount of testing would be a good thing.