Add some modules

closes #39