interim checkin
bulk refactor - almost done