Working on fixing 2x geolocation issue with state. Also added validation.