Reworked to use Stage / Actor format