REFACTORED ALL THE THINGS!