Redid EVERYTHING COMPLETELT