super merge

Sorry Ernie. We've doing a lot of stuff. This should enable us to keep working and have the same info.