I'm about to make a huge change, so this will be a nice commit in 3d