* commit 'aacd795b18f5f9886747c29020c6f59ea7ef3c89': Beginnings of bouncer support; add scrims and state tracking