This is the initial Commit of a Complete Rewrite