Broke Properties enum out of Location, renamed to LocationProperties.  Changed from enum to class with final attributes set by constructor parameters.