diff --git a/src/MobileApps/MyDriving.sln b/src/MobileApps/MyDriving.sln
index f923683e..d63ba32c 100644
--- a/src/MobileApps/MyDriving.sln
+++ b/src/MobileApps/MyDriving.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27428.2015
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyDriving.iOS", "MyDriving\MyDriving.iOS\MyDriving.iOS.csproj", "{DE56E591-0655-43D7-A1B9-B3280F78B667}"
 EndProject
@@ -43,12 +43,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObdLibiOS", "..\OBDLibrary\
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		MyDriving\MyDriving.DataObjects\MyDriving.DataObjects.projitems*{bd4403c0-6cd5-4030-b1a3-7ad98b9b80ca}*SharedItemsImports = 13
 		MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{219edca6-56bb-4ebd-ae46-c691f0aed767}*SharedItemsImports = 4
 		MyDriving\MyDriving.DataObjects\MyDriving.DataObjects.projitems*{649300ce-70ea-4606-983f-f4476fdd6c7e}*SharedItemsImports = 4
-		MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{efa3478d-88c0-41a8-ad5e-5878e42fe3e2}*SharedItemsImports = 13
 		MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{b09661c2-82a6-4d16-b4fd-7b23d0ffe1fe}*SharedItemsImports = 4
+		MyDriving\MyDriving.DataObjects\MyDriving.DataObjects.projitems*{bd4403c0-6cd5-4030-b1a3-7ad98b9b80ca}*SharedItemsImports = 13
 		MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{de56e591-0655-43d7-a1b9-b3280f78b667}*SharedItemsImports = 4
+		MyDriving\MyDriving.Shared\MyDriving.Shared.projitems*{efa3478d-88c0-41a8-ad5e-5878e42fe3e2}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AppStore|Any CPU = AppStore|Any CPU
@@ -216,7 +216,6 @@ Global
 		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhone.Deploy.0 = Debug|x86
 		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
 		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhoneSimulator.Build.0 = Debug|x86
-		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|iPhoneSimulator.Deploy.0 = Debug|x86 
 		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{219EDCA6-56BB-4EBD-AE46-C691F0AED767}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
@@ -922,4 +921,7 @@ Global
 		{7A88DA9B-A374-4DE2-B46E-ED2C45434508} = {3CE83CE0-11E9-4CE8-83CE-0EE6C6700B7F}
 		{8B136D60-8E68-4871-BF25-52E27C61E8E9} = {3CE83CE0-11E9-4CE8-83CE-0EE6C6700B7F}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {B4FF5FB5-ECF1-4A3B-822E-7519BC22ED88}
+	EndGlobalSection
 EndGlobal
diff --git a/src/MobileApps/MyDriving/MyDriving.Android/Resources/Resource.designer.cs b/src/MobileApps/MyDriving/MyDriving.Android/Resources/Resource.designer.cs
index 0ab60145..f7e16a86 100644
--- a/src/MobileApps/MyDriving/MyDriving.Android/Resources/Resource.designer.cs
+++ b/src/MobileApps/MyDriving/MyDriving.Android/Resources/Resource.designer.cs
@@ -5271,145 +5271,154 @@ public partial class String
 			public const int hockeyapp_feedback_failed_title = 2131099730;
 			
 			// aapt resource value: 0x7f060053
-			public const int hockeyapp_feedback_generic_error = 2131099731;
+			public const int hockeyapp_feedback_fetching_feedback_text = 2131099731;
 			
 			// aapt resource value: 0x7f060054
-			public const int hockeyapp_feedback_last_updated_text = 2131099732;
+			public const int hockeyapp_feedback_generic_error = 2131099732;
 			
 			// aapt resource value: 0x7f060055
-			public const int hockeyapp_feedback_max_attachments_allowed = 2131099733;
+			public const int hockeyapp_feedback_last_updated_text = 2131099733;
 			
 			// aapt resource value: 0x7f060056
-			public const int hockeyapp_feedback_message_hint = 2131099734;
+			public const int hockeyapp_feedback_max_attachments_allowed = 2131099734;
 			
 			// aapt resource value: 0x7f060057
-			public const int hockeyapp_feedback_name_hint = 2131099735;
+			public const int hockeyapp_feedback_message_hint = 2131099735;
 			
 			// aapt resource value: 0x7f060058
-			public const int hockeyapp_feedback_refresh_button_text = 2131099736;
+			public const int hockeyapp_feedback_name_hint = 2131099736;
 			
 			// aapt resource value: 0x7f060059
-			public const int hockeyapp_feedback_response_button_text = 2131099737;
+			public const int hockeyapp_feedback_refresh_button_text = 2131099737;
 			
 			// aapt resource value: 0x7f06005a
-			public const int hockeyapp_feedback_select_file = 2131099738;
+			public const int hockeyapp_feedback_response_button_text = 2131099738;
 			
 			// aapt resource value: 0x7f06005b
-			public const int hockeyapp_feedback_select_picture = 2131099739;
+			public const int hockeyapp_feedback_select_file = 2131099739;
 			
 			// aapt resource value: 0x7f06005c
-			public const int hockeyapp_feedback_send_button_text = 2131099740;
+			public const int hockeyapp_feedback_select_picture = 2131099740;
 			
 			// aapt resource value: 0x7f06005d
-			public const int hockeyapp_feedback_send_generic_error = 2131099741;
+			public const int hockeyapp_feedback_send_button_text = 2131099741;
 			
 			// aapt resource value: 0x7f06005e
-			public const int hockeyapp_feedback_send_network_error = 2131099742;
+			public const int hockeyapp_feedback_send_generic_error = 2131099742;
 			
 			// aapt resource value: 0x7f06005f
-			public const int hockeyapp_feedback_subject_hint = 2131099743;
+			public const int hockeyapp_feedback_send_network_error = 2131099743;
 			
 			// aapt resource value: 0x7f060060
-			public const int hockeyapp_feedback_title = 2131099744;
+			public const int hockeyapp_feedback_sending_feedback_text = 2131099744;
 			
 			// aapt resource value: 0x7f060061
-			public const int hockeyapp_feedback_validate_email_empty = 2131099745;
+			public const int hockeyapp_feedback_subject_hint = 2131099745;
 			
 			// aapt resource value: 0x7f060062
-			public const int hockeyapp_feedback_validate_email_error = 2131099746;
+			public const int hockeyapp_feedback_title = 2131099746;
 			
 			// aapt resource value: 0x7f060063
-			public const int hockeyapp_feedback_validate_name_error = 2131099747;
+			public const int hockeyapp_feedback_validate_email_empty = 2131099747;
 			
 			// aapt resource value: 0x7f060064
-			public const int hockeyapp_feedback_validate_subject_error = 2131099748;
+			public const int hockeyapp_feedback_validate_email_error = 2131099748;
 			
 			// aapt resource value: 0x7f060065
-			public const int hockeyapp_feedback_validate_text_error = 2131099749;
+			public const int hockeyapp_feedback_validate_name_error = 2131099749;
 			
 			// aapt resource value: 0x7f060066
-			public const int hockeyapp_login_email_hint = 2131099750;
+			public const int hockeyapp_feedback_validate_subject_error = 2131099750;
 			
 			// aapt resource value: 0x7f060067
-			public const int hockeyapp_login_headline_text = 2131099751;
+			public const int hockeyapp_feedback_validate_text_error = 2131099751;
 			
 			// aapt resource value: 0x7f060068
-			public const int hockeyapp_login_headline_text_email_only = 2131099752;
+			public const int hockeyapp_login_email_hint = 2131099752;
 			
 			// aapt resource value: 0x7f060069
-			public const int hockeyapp_login_login_button_text = 2131099753;
+			public const int hockeyapp_login_headline_text = 2131099753;
 			
 			// aapt resource value: 0x7f06006a
-			public const int hockeyapp_login_missing_credentials_toast = 2131099754;
+			public const int hockeyapp_login_headline_text_email_only = 2131099754;
 			
 			// aapt resource value: 0x7f06006b
-			public const int hockeyapp_login_password_hint = 2131099755;
+			public const int hockeyapp_login_login_button_text = 2131099755;
 			
 			// aapt resource value: 0x7f06006c
-			public const int hockeyapp_paint_dialog_message = 2131099756;
+			public const int hockeyapp_login_missing_credentials_toast = 2131099756;
 			
 			// aapt resource value: 0x7f06006d
-			public const int hockeyapp_paint_dialog_negative_button = 2131099757;
+			public const int hockeyapp_login_password_hint = 2131099757;
 			
 			// aapt resource value: 0x7f06006e
-			public const int hockeyapp_paint_dialog_neutral_button = 2131099758;
+			public const int hockeyapp_paint_dialog_message = 2131099758;
 			
 			// aapt resource value: 0x7f06006f
-			public const int hockeyapp_paint_dialog_positive_button = 2131099759;
+			public const int hockeyapp_paint_dialog_negative_button = 2131099759;
 			
 			// aapt resource value: 0x7f060070
-			public const int hockeyapp_paint_indicator_toast = 2131099760;
+			public const int hockeyapp_paint_dialog_neutral_button = 2131099760;
 			
 			// aapt resource value: 0x7f060071
-			public const int hockeyapp_paint_menu_clear = 2131099761;
+			public const int hockeyapp_paint_dialog_positive_button = 2131099761;
 			
 			// aapt resource value: 0x7f060072
-			public const int hockeyapp_paint_menu_save = 2131099762;
+			public const int hockeyapp_paint_indicator_toast = 2131099762;
 			
 			// aapt resource value: 0x7f060073
-			public const int hockeyapp_paint_menu_undo = 2131099763;
+			public const int hockeyapp_paint_menu_clear = 2131099763;
 			
 			// aapt resource value: 0x7f060074
-			public const int hockeyapp_permission_dialog_negative_button = 2131099764;
+			public const int hockeyapp_paint_menu_save = 2131099764;
 			
 			// aapt resource value: 0x7f060075
-			public const int hockeyapp_permission_dialog_positive_button = 2131099765;
+			public const int hockeyapp_paint_menu_undo = 2131099765;
 			
 			// aapt resource value: 0x7f060076
-			public const int hockeyapp_permission_update_message = 2131099766;
+			public const int hockeyapp_permission_dialog_negative_button = 2131099766;
 			
 			// aapt resource value: 0x7f060077
-			public const int hockeyapp_permission_update_title = 2131099767;
+			public const int hockeyapp_permission_dialog_positive_button = 2131099767;
 			
 			// aapt resource value: 0x7f060078
-			public const int hockeyapp_update_button = 2131099768;
+			public const int hockeyapp_permission_update_message = 2131099768;
 			
 			// aapt resource value: 0x7f060079
-			public const int hockeyapp_update_dialog_message = 2131099769;
+			public const int hockeyapp_permission_update_title = 2131099769;
 			
 			// aapt resource value: 0x7f06007a
-			public const int hockeyapp_update_dialog_negative_button = 2131099770;
+			public const int hockeyapp_update_button = 2131099770;
 			
 			// aapt resource value: 0x7f06007b
-			public const int hockeyapp_update_dialog_positive_button = 2131099771;
+			public const int hockeyapp_update_dialog_message = 2131099771;
 			
 			// aapt resource value: 0x7f06007c
-			public const int hockeyapp_update_dialog_title = 2131099772;
+			public const int hockeyapp_update_dialog_negative_button = 2131099772;
 			
 			// aapt resource value: 0x7f06007d
-			public const int hockeyapp_update_mandatory_toast = 2131099773;
+			public const int hockeyapp_update_dialog_positive_button = 2131099773;
+			
+			// aapt resource value: 0x7f06007e
+			public const int hockeyapp_update_dialog_title = 2131099774;
+			
+			// aapt resource value: 0x7f06007f
+			public const int hockeyapp_update_mandatory_toast = 2131099775;
+			
+			// aapt resource value: 0x7f060080
+			public const int hockeyapp_update_version_details_label = 2131099776;
 			
 			// aapt resource value: 0x7f060037
 			public const int library_name = 2131099703;
 			
-			// aapt resource value: 0x7f06007e
-			public const int login_facebook = 2131099774;
+			// aapt resource value: 0x7f060081
+			public const int login_facebook = 2131099777;
 			
-			// aapt resource value: 0x7f060080
-			public const int login_microsoft = 2131099776;
+			// aapt resource value: 0x7f060083
+			public const int login_microsoft = 2131099779;
 			
-			// aapt resource value: 0x7f06007f
-			public const int login_twitter = 2131099775;
+			// aapt resource value: 0x7f060082
+			public const int login_twitter = 2131099778;
 			
 			// aapt resource value: 0x7f060034
 			public const int status_bar_notification_info_overflow = 2131099700;
diff --git a/src/MobileApps/MyDriving/MyDriving.Android/Resources/layout/activity_login.axml b/src/MobileApps/MyDriving/MyDriving.Android/Resources/layout/activity_login.axml
index ed92c49e..d2d4b4fe 100644
--- a/src/MobileApps/MyDriving/MyDriving.Android/Resources/layout/activity_login.axml
+++ b/src/MobileApps/MyDriving/MyDriving.Android/Resources/layout/activity_login.axml
@@ -15,7 +15,6 @@
         android:orientation="vertical">
         <Space
             android:layout_width="match_parent"
-
             android:layout_height="0dp"
             android:layout_weight="1" />
         <ImageView
diff --git a/src/MobileApps/MyDriving/MyDriving.UITests/MyDriving.UITests.csproj b/src/MobileApps/MyDriving/MyDriving.UITests/MyDriving.UITests.csproj
index 64ec21e0..c6fd1744 100644
--- a/src/MobileApps/MyDriving/MyDriving.UITests/MyDriving.UITests.csproj
+++ b/src/MobileApps/MyDriving/MyDriving.UITests/MyDriving.UITests.csproj
@@ -84,9 +84,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup />
   <ItemGroup>
-    <Folder Include="Pages\" />
-    <Folder Include="Helpers\" />
-    <Folder Include="Tests\" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.csproj b/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.csproj
index d3f341a4..8e91456e 100644
--- a/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.csproj
+++ b/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.csproj
@@ -400,9 +400,6 @@
     <SDKReference Include="Microsoft.VCLibs, Version=14.0">
       <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
     </SDKReference>
-    <SDKReference Include="SQLite.UWP.2015, Version=3.12.1">
-      <Name>SQLite for Universal Windows Platform</Name>
-    </SDKReference>
   </ItemGroup>
   <ItemGroup />
   <Import Project="..\MyDriving.Shared\MyDriving.Shared.projitems" Label="Shared" />
diff --git a/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.props b/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.props
index e8f1a4db..7e41a163 100644
--- a/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.props
+++ b/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.props
@@ -1,9 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
+    <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">C:\Users\Pratik\Source\Repos\MyDriving2\src\MobileApps\MyDriving\MyDriving.UWP\project.lock.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Pratik\.nuget\packages\;C:\Program Files (x86)\Microsoft SDKs\NuGetPackagesFallback\</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.6.1</NuGetToolVersion>
   </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.props" Condition="Exists('$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.props')" />
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.props" Condition="Exists('$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.props')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.targets b/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.targets
index 4a136863..fd9e595d 100644
--- a/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.targets
+++ b/src/MobileApps/MyDriving/MyDriving.UWP/MyDriving.UWP.nuget.targets
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
-    <Import Project="$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.targets" Condition="Exists('$(NuGetPackageRoot)\SQLitePCL\3.8.7.2\build\netcore451\SQLitePCL.targets')" />
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.targets" Condition="Exists('$(NuGetPackageRoot)sqlitepcl\3.8.7.2\build\netcore451\SQLitePCL.targets')" />
+    <Import Project="$(NuGetPackageRoot)microsoft.bcl.build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.bcl.build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml b/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml
index 5818a8ce..ec4c2456 100644
--- a/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml
+++ b/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml
@@ -52,6 +52,15 @@
                 </StackPanel>
 
             </Button>
+
+            <Button x:Name="SkipButtonLogin" Style="{StaticResource LoginButtonStyle}" Click="SkipButtonLogin_Click"
+                    Background="DarkSlateGray"  >
+
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="20,0,0,0">
+                    <TextBlock Text="Skip Authentication"  Style="{StaticResource LoginButtonTextStyle}" />
+                </StackPanel>
+
+            </Button>
         </StackPanel>
 
         <Button x:Name="ContinueButton" HorizontalAlignment="Center" Margin="0,10,0,0"  Content="Continue"  Click="Continue_Click" Grid.Row="2" VerticalAlignment="Top" Visibility="Collapsed" />
diff --git a/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml.cs b/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml.cs
index ba2f050b..f6efd92f 100644
--- a/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml.cs
+++ b/src/MobileApps/MyDriving/MyDriving.UWP/Views/LoginView.xaml.cs
@@ -81,5 +81,12 @@ private void SetImageSource()
         {
             ProfileImage.Source = new BitmapImage(new Uri(Settings.Current.UserProfileUrl));
         }
+
+        private void SkipButtonLogin_Click(object sender, RoutedEventArgs e)
+        {
+            viewModel.InitFakeUser();
+            viewModel.IsLoggedIn = true;
+            viewModel.PropertyChanged += ViewModel_PropertyChanged;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/MobileApps/MyDriving/MyDriving.UWP/project.json b/src/MobileApps/MyDriving/MyDriving.UWP/project.json
index d9e073cf..e6c76c68 100644
--- a/src/MobileApps/MyDriving/MyDriving.UWP/project.json
+++ b/src/MobileApps/MyDriving/MyDriving.UWP/project.json
@@ -9,6 +9,7 @@
     "Newtonsoft.Json": "8.0.3",
     "Plugin.Share": "4.0.0",
     "Refractored.MvvmHelpers": "1.0.1",
+    "SQLite.uwp": "3.22.0",
     "Xam.Plugin.Connectivity": "2.1.2",
     "Xam.Plugin.DeviceInfo": "2.0.2",
     "Xam.Plugin.Geolocator": "3.0.4",
@@ -16,7 +17,7 @@
     "Xam.Plugins.Settings": "2.1.0"
   },
   "frameworks": {
-    "uap10.0": {}
+    "uap10.0.10240": {}
   },
   "runtimes": {
     "win10-arm": {},
diff --git a/src/MobileApps/MyDriving/MyDriving.iOS/MyDriving.iOS.csproj b/src/MobileApps/MyDriving/MyDriving.iOS/MyDriving.iOS.csproj
index 4d6f5344..28c27d3a 100644
--- a/src/MobileApps/MyDriving/MyDriving.iOS/MyDriving.iOS.csproj
+++ b/src/MobileApps/MyDriving/MyDriving.iOS/MyDriving.iOS.csproj
@@ -285,52 +285,52 @@
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Contents.json">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Default.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Default%402x.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Default-568h%402x.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Default-Portrait.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\LaunchImage.launchimage\Default-Portrait%402x.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-29.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-58.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-87.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-80.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-120.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-57.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-114.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-1202.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Icon-180.png">
-      <InProject>false</InProject>
+      <Visible>false</Visible>
     </ImageAsset>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/OBDLibrary/ObdLibAndroid/ObdLibAndroid.csproj b/src/OBDLibrary/ObdLibAndroid/ObdLibAndroid.csproj
index 0b2e7d85..c70aa5d2 100644
--- a/src/OBDLibrary/ObdLibAndroid/ObdLibAndroid.csproj
+++ b/src/OBDLibrary/ObdLibAndroid/ObdLibAndroid.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>ObdLibAndroid</RootNamespace>
     <AssemblyName>ObdLibAndroid</AssemblyName>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
@@ -25,9 +25,12 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <AndroidSupportedAbis></AndroidSupportedAbis>
-    <EmbedAssembliesIntoApk></EmbedAssembliesIntoApk>
-    <AndroidFastDeploymentType></AndroidFastDeploymentType>
+    <AndroidSupportedAbis>
+    </AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>
+    </EmbedAssembliesIntoApk>
+    <AndroidFastDeploymentType>
+    </AndroidFastDeploymentType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
@@ -36,9 +39,12 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AndroidSupportedAbis></AndroidSupportedAbis>
-    <EmbedAssembliesIntoApk></EmbedAssembliesIntoApk>
-    <AndroidFastDeploymentType></AndroidFastDeploymentType>
+    <AndroidSupportedAbis>
+    </AndroidSupportedAbis>
+    <EmbedAssembliesIntoApk>
+    </EmbedAssembliesIntoApk>
+    <AndroidFastDeploymentType>
+    </AndroidFastDeploymentType>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />