refactor, scene implementation is broken