More work on Market. Nearly finished