Merging in Melissa's additions (separate branch)

A dedicated branch for merging in @mjhubisz changes.  This PR replaces #3.