Ready to merge branches

Looks ready to go.