Interim checkin. Working from a functionality point of view, but need to fix three defects