Just as a follow up, I have been using Freecad & Onshape. I like them both, using Onshape more as I like the way it mates multiple parts.

Onshape, although it is web based, allows 100 Meg of 'private' storage.

I had been using solidworks exclusively for the past 4 years, but my 'free access' will likely go away after this year, and find Onshape & Freecad will do all that I need (and more)

Onshape also can imports all of my Solidworks models.