just while I'm at it, same goes for world::worldobjects - switch there too?