Sally

Fixes #21