looks like I also added a few other things that I forgot about