Added Locations

Just fixed on new locations to switch case.
Still have to work on functions for different locations and a million
other things.