First pass Update Core to 1.0.6

I believe I have merged in everyt