Final Phase 2 Edits from Brian
Merged all Phase 2 Work by Dave & Brian