Added Maddies changes to mines.
Now working with maddies but need to fix the friends bug still.