Heidi - Finished Phase 1

updates for phase 1