More work to make the dev site function properly