Refactored most things into scene