First draft, lot of work to do

Fixes #1