Totally messed up a few things — fixes hopefully