Modules are set up

All of the legwork for the modules is done. All that's left is adding
functionality