Fixed bug in apply call
Added new UnitStateBuilder
Unit state builders functioning
Added support for aggregated state
Partially included AggregateStateBuilder