WIP: Add 3D support

Change-Id: I128ec2a97f72541c837045be07abe638fa47e591