Still fixing what I screwed up