LOTS of changes. Added locations.