5 Years Ago
Bit of refactoring and fixing things that got lost in the merge