Builds Sprint 2 (Issue #88)