New form

Fixes #44