Main player redesign

Merging V3 into Master