Simplified two system model into single system model. Preparing for fully eventized thread-safe systems.