Milestone M1 Finished

Merging all the M1 changes.