More headway on simulation code, though not complete yet.