Reinstate our Pro migration work to date
Pro migration is still not ready, restricting it to it's own branch