Phase2 changes and updates

This is all the changes and updates that go along with phase2 development.