Stage 1

Fixes issue #1