Massive update to decoration of city

This code probably needs some review. Have tried writing the code to
work with the specs of the bugparser Claire if working on