More bug juices and tested units.  Needs contracts