Simulation almost functional.  Need to get rid of the differing feature stuff.