New class structure is working with better support for scene/level changing.