Sprint 2 - update 0.2 - 80% through phase 2