The Great Refactor: Part 2

Trying to fix some Git Issues with the last commit.