starting to clean up to adjust to the new always-line model, interim checkin