Phase 2 / Phase 3

previous commit missed some updates, recommitting