3D Patch 1

Intermediary patch - development transfer between PC1&2