moving things to its own fixer