Fixed it, but I need to fix it some more