Major upgrade, it's working!

Everything seems to be working.