Move to defaults

Fixes #12