Started refactoring things so they make more sense name wise