Initial work

...early progress. Syncing to master for an easier name change.