Universal Modules Support

Needs better testing than I have done, but I didn't mess with much so it should just work.