Closed #66

This takes care of Cliff’s design requests