Sounds like you're dealing with this in a separate branch, so I'll merge everything else for now.