i deleted stuff and then readded more stuff
Merge https://github.com/InternetBully/DangKenny_CSC11_2438209