Intermediate checkin; does not compile