WIP
Fixes #11
Fixes #15
Fixes #10
Fixes #6