Pulling out the code from my last commit that doesn't require a database update
Merge pull request #347 from hmcq6/HM_Yay_Lets_Go_In_Circles!

Pulling out the code from my last commit that doesn't require a database...