More structured now. Octree & stupid ray casting stuff still  missing