Reworking on Dev branch, rewrite and other modules in progress - View it on GitHub