Switched to using 2 aggregate states

Signed-off-by: David Evans <dgevans42@gmail.com>