Wiring up module loading

Finishes out #346