Started a massive refactoring on the mod to increase modularity...