Added new custom module, and couple of other files