big changes!  Almost to rev 8.