Refactor
moving things around