work in progress
Closes #89