WIP
WIP
Fixes #7
Fixes #9
Merge branch 'WIP'