WIP
Fixes #11