Added some more modules. To do: factor outs boiler plate.