incremental checkin of refactor. Tests failing