Started working on upgrading

--Forgot to change branches, oh God