Refactor....all the things