Push prior work on extension

Pushing the last couple months of work on the extension.