Sprint 40

closes #8