fakeout, refactor wasnt complete -- now is.