Adding Locations and Stats
Changing Stats to use a string for the name
Small deletions