First checked in version. Lots of test code...