work in progress
Closes #137
Closes #149