Merging in Melissa's additions

Hey @mjhubisz, would you like to merge in your changes? We can use this pull request to discuss them.

We don't have to merge all them right now if some files are still in development. We can make a smaller merge first of the stable changes.