Refactored to reduce complexity
Added storage of sim results
v0.0.8