Staging more changes
Fixes #7