Phase 1 Changes

A lot of changes made