added city and some coredata stuff