Interim checkin, still debugging.