Preparing to separate out the market stuff