Moving things out of the monstrosity function
Merge pull request #5 from majense77/Abstraction_Brah

Moving things out of the monstrosity function, making things more logical.