Initial combined import from a few other projects