Issue #145

Stage 2, where our work usually begins