Project 2 features

These should have been in the repo previously.