Updates AC-1244. Use a sub-batch in the state manager. This will allow us to eliminate state operations, and possibly eliminate most of the state manager.