Merging in Melissa's additions

Hey @mjhubisz, would you to merge in your changes? We can use this pull request to discuss them.