finishing up the city & edge code