Module Overhaul

Made extensive modifications to the module to ensure it is not specific
to the company I work for.