Latest Version from Phil

Includes his level design changes, everything all of us have done so far
etc.