Moved some things around because I don't know what I am doing