continuing the upgrade.... I feel like its very close to working