Some work on Azure Deploy