checkin working copy for Andy to look at