Ernesto sep13 2

Addresses part of #70.  Must be merged after #144.