Renaming this module to be something useful
Removing debug messages
Manually merging