End of day.

Working full simulated.  Need clean rewrite.

-sara wrote half of this.