[@TheDarkTemplar] DONE. Let me know if any changes are needed