Correct Importing
Updated for inclusion of Base partial set
Made Base temlates easier to maintain
Version Bump