Checkin in a working version. Continuing from home.