Imported some of Ethan's Modules to fix #59