Added some more changes, trying to get everything but the map my fitness stuff done.