reworking #52 - refactored the scene graph o____o