Interim checkin; basically feature complete