Completely Re-did the mod
Re-named some things