Adding Modules

@todo complete this