Complete rewrite of the mod (Part #1) (Again)