moar refactor
moar refactor