Refactoring, API additions

We've resolved a few licensing quirks. But not all of them