incremental refactor checkin, tests failing