major refactor… stop passing that scene around!