Initial commit
Set up new tree
Cleaning up merge with old head