Lots of stuff

These changes have been sitting in my Local for months. I don't really
remember what is going on or what any of it is for. So ...... yea.