Almost ready

Pin Sorafy to get started