Feature/resource generator

There are a couple issues, mostly in city generator that I don't know how to resolve.