initial refactor for fixtures
working on initial commit tests; still failing but executing