Cleaner param definition to . Added some geocode code. (currently not in use)