3d Mostly done

3d Mostly done