Upgrade is complete

Upgrade did actually complete. pictrs had some issues but I think I fixed them (hopefully).

Any issues let me know.