Added market scaffold and lots others