allow city names, allow new api, convert to Moo