Merge branch 'add-module'

Greatly improved adding modules!