Complete milestone 101

Closes #40 and #44