Don't merge yet -- work in process.

You can merge this now.  Thanks!