Redid modules. They're pretty cool now