diff --git a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
index f5ff3e1122150cff48301ca8630fd0ee100ba9dc..9317a16d76f519adbe73eff3ef2c260a491a5ecd 100644
--- a/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
+++ b/azure_m/azure_m/azure_m.Android/Resources/Resource.designer.cs
@@ -14,7 +14,11 @@ namespace azure_m.Droid
 {
 	
 	
+<<<<<<< HEAD
 	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.2.0.155")]
+=======
+	[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "12.3.3.31")]
+>>>>>>> de2881de715d054b6560a4ffa9cd65c85b996eca
 	public partial class Resource
 	{
 		
diff --git a/azure_m/azure_m/azure_m/Models/RequestModels/CreateOrUpdateVM.cs b/azure_m/azure_m/azure_m/Models/RequestModels/CreateOrUpdateVM.cs
index 613e8b3c9a468d28534a83491ef2ca2a1a103e7a..5ae5e40040af27ef65495b34840827a34658b58f 100644
--- a/azure_m/azure_m/azure_m/Models/RequestModels/CreateOrUpdateVM.cs
+++ b/azure_m/azure_m/azure_m/Models/RequestModels/CreateOrUpdateVM.cs
@@ -3,10 +3,152 @@
 
     namespace PublicIPAddressRequestModels {
         // TODO
+        
+
+        public class PublicIPAddressProperties
+        {
+            public IPAlloctionMethod publicIPAllocationMethod;
+
+            public int idleTimeoutInMinutes;
+
+            public IPVersion publicIPAddressVersion;
+
+            public PublicIPAddressDnsSettings dnsSettings;
+        }
+
+        public class PublicIPAddressDnsSettings
+        {
+            public string domainNameLabel;
+        }
+
+        public class IPVersion
+        {
+            public string IPv4;
+
+            public string IPv6;
+        }
+
+        public class IPAlloctionMethod
+        {
+            public string Dynamic;
+
+            public string Static;
+        }
+
+        public class PublicIPAddress
+        {
+            public string id;
+
+            public string location;
+
+            public PublicIPAddressProperties properties;
+
+
+        }
+        public class PublicIPAddressSku
+        {
+            public PublicIPAddressSkuName name;
+
+            public PublicIPAddressSkuTier tier;
+        }
+
+        public class PublicIPAddressSkuTier
+        {
+            public string Basic;
+
+            public string Standard;
+        }
+
+        public class PublicIPAddressSkuName
+        {
+            public string Global;
+
+            public string Regional;
+        }
+
+        public class CreateOrUpdatePublicIPAddressBody
+        {
+            public string id;
+
+            public string location;
+
+            public PublicIPAddressProperties properties;
+
+            public PublicIPAddressSku sku;
+        }
+
+        public class CreateOrUpdatePublicIPAddressUri {
+            public string publicIpAddressName;
+
+            public string resourceGroupName;
+        }
+
+        public class CreateOrUpdatePublicIPAddressRequest:IRequest<
+            CreateOrUpdatePublicIPAddressBody,CreateOrUpdatePublicIPAddressUri
+            >
+        { }
     }
 
     namespace NetworkInterfaceRequestModels {
         // TODO
+        using PublicIPAddressRequestModels;
+        public class NetworkInterfacesProperties
+        {
+           public bool enableAcceleratedNetworking;
+
+           public NetworkInterfaceIPConfiguration ipConfigurations;
+         }
+        public class NetworkInterfaceIPConfiguration
+        {
+            public string name;
+
+            public NetworkInterfaceIPConfigurationProperties properties;
+        }
+        public class NetworkInterfaceIPConfigurationProperties
+        {
+            public PublicIPAddress publicIPAddress;
+
+            public Subnet subnet;
+
+            public SubResource gatewayLoadBalancer;
+        }
+
+        public class SubResource
+        {
+            public string id;
+        }
+
+        public class Subnet
+        {
+            //public string etag;
+
+            public string id;
+
+            //public string name;
+        }
+
+        public class CreateOrUpdateNIBody
+        {  public string location;
+
+            //public string id;
+
+            //public string extendedLocation;
+
+            public NetworkInterfacesProperties properties;
+        }
+        public class CreateOrUpdateNIUri
+        {
+            public string networkInterfaceName;
+
+            public string resourceGroupName;
+
+        }
+
+        public class CreateOrUpdateNIRequest : IRequest<
+               CreateOrUpdateNIUri,
+               CreateOrUpdateNIBody>
+        { }
+
     }
 
     namespace VMRequestModels