Busy with a big upgrade

Not sure why it was forced on me, but may as well do it