wip
Closes #45