175additions

Stuff left out of #175