Finished testing heuristics and aggregation seems to be working properly.
A few minor adjustments and the whole simulator seems to be working.  Should rigorously check later though...