Add more sim logic.

Simulation appears to be complete, but that is not for sure yet.