New Waverley Market: scheme design