Completed Phase 2

Completed phase 2 programming with bonus features