Renaming to make more sense
Functionality done, needs refactor