Sprint 2 - update 0.3 - 85% through phase 2