Try to get things working again

Version upgrades and starting to fix things. WIP - not ready to land yet, but comment if you see bad stuff.