Fixed it so that the whole thing isn't broken
Stuff