Feature: Scenes & Small Optimizations