cuke tests for this branch are passing. Maybe time to refactor soon, though?