Tweaks to the Stage class. A lot more work is needed.