Got rid of funsies, is now set up for project 5