Finished coding/testing Phase II
Final commit of the day