Got rid of some of the no return statement errors. Still need to figure out the rest