Refactored scene stuff and got it running again :)