City reaches agreement on Waterside redevelopment