Fixed it up a little, not done yet