Version 4

Almost ready to ship.