Commented my helper & module
Iniital Merge With James