Initial commit of working code.
Created Module.
Resolved merge conflict