diff --git a/src/managed/OpenLiveWriter.BlogClient/Clients/GoogleBloggerv3Client.cs b/src/managed/OpenLiveWriter.BlogClient/Clients/GoogleBloggerv3Client.cs
index b35d214f..0a84f3fb 100644
--- a/src/managed/OpenLiveWriter.BlogClient/Clients/GoogleBloggerv3Client.cs
+++ b/src/managed/OpenLiveWriter.BlogClient/Clients/GoogleBloggerv3Client.cs
@@ -23,9 +23,9 @@ using Google.Apis.Util;
 using System.Globalization;
 using System.Diagnostics;
 using Google.Apis.Blogger.v3.Data;
-using System.Net.Http.Headers;
 using OpenLiveWriter.Controls;
 using System.Windows.Forms;
+using Newtonsoft.Json;
 
 namespace OpenLiveWriter.BlogClient.Clients
 {
@@ -88,7 +88,7 @@ namespace OpenLiveWriter.BlogClient.Clients
                 Permalink = post.Url,
                 Contents = post.Content,
                 DatePublished = post.Published.Value,
-                Keywords = string.Join(new string(LabelDelimiter,1), post.Labels ?? new List<string>())
+                Categories = post.Labels?.Select(x => new BlogPostCategory(x)).ToArray() ?? new BlogPostCategory[0]
             };
         }
 
@@ -106,10 +106,12 @@ namespace OpenLiveWriter.BlogClient.Clients
 
         private static Post ConvertToGoogleBloggerPost(BlogPost post)
         {
+            var labels = post.Categories?.Select(x => x.Name).ToList();
+            labels?.AddRange(post.NewCategories?.Select(x => x.Name) ?? new List<string>());
             return new Post()
             {
                 Content = post.Contents,
-                Labels = post.Keywords?.Split(new char[] { LabelDelimiter }, StringSplitOptions.RemoveEmptyEntries).Select(k => k.Trim()).ToList(),
+                Labels = labels ?? new List<string>(),
                 // TODO:OLW - DatePublishedOverride didn't work quite right. Either the date published override was off by several hours, 
                 // needs to be normalized to UTC or the Blogger website thinks I'm in the wrong time zone.
                 Published = post.HasDatePublishedOverride ? post?.DatePublishedOverride : null,
@@ -142,15 +144,15 @@ namespace OpenLiveWriter.BlogClient.Clients
         {
             // configure client options
             BlogClientOptions clientOptions = new BlogClientOptions();
-            clientOptions.SupportsCategories = false;
-            clientOptions.SupportsMultipleCategories = false;
-            clientOptions.SupportsNewCategories = false;
+            clientOptions.SupportsCategories = true;
+            clientOptions.SupportsMultipleCategories = true;
+            clientOptions.SupportsNewCategories = true;
             clientOptions.SupportsCustomDate = true;
             clientOptions.SupportsExcerpt = false;
             clientOptions.SupportsSlug = false;
             clientOptions.SupportsFileUpload = true;
-            clientOptions.SupportsKeywords = true;
-            clientOptions.SupportsGetKeywords = true;
+            clientOptions.SupportsKeywords = false;
+            clientOptions.SupportsGetKeywords = false;
             clientOptions.SupportsPages = true;
             clientOptions.SupportsExtendedEntries = true;
             _clientOptions = clientOptions;
@@ -300,13 +302,33 @@ namespace OpenLiveWriter.BlogClient.Clients
         public BlogInfo[] GetUsersBlogs()
         {
             var blogList = GetService().Blogs.ListByUser("self").Execute();
-            return blogList.Items.Select(b => new BlogInfo(b.Id, b.Name, b.Url)).ToArray();
+            return blogList.Items?.Select(b => new BlogInfo(b.Id, b.Name, b.Url)).ToArray() ?? new BlogInfo[0];
         }
 
+        private const string CategoriesEndPoint = "/feeds/posts/summary?alt=json&max-results=0";
         public BlogPostCategory[] GetCategories(string blogId)
         {
-            // Google Blogger does not support categories
-            return new BlogPostCategory[] { };
+            var categories = new BlogPostCategory[0];
+            var blog = GetService().Blogs.Get(blogId).Execute();
+
+            if (blog != null)
+            {
+                var categoriesUrl = string.Concat(blog.Url, CategoriesEndPoint);
+
+                var response = SendAuthenticatedHttpRequest(categoriesUrl, 30, CreateAuthorizationFilter());
+                if (response != null)
+                {
+                    using (var reader = new StreamReader(response.GetResponseStream()))
+                    {
+                        var json = reader.ReadToEnd();
+                        var item = JsonConvert.DeserializeObject<CategoryResponse>(json);
+                        var cats = item?.Feed?.CategoryArray.Select(x => new BlogPostCategory(x.Term));
+                        categories = cats?.ToArray() ?? new BlogPostCategory[0];
+                    }
+                }
+            }
+
+            return categories;
         }
 
         public BlogPostKeyword[] GetKeywords(string blogId)
@@ -328,7 +350,7 @@ namespace OpenLiveWriter.BlogClient.Clients
             recentPostsRequest.Status = PostsResource.ListRequest.StatusEnum.Live;
 
             var recentPosts = recentPostsRequest.Execute();
-            return recentPosts.Items.Select(p => ConvertToBlogPost(p)).ToArray();
+            return recentPosts.Items?.Select(ConvertToBlogPost).ToArray() ?? new BlogPost[0];
         }
 
         public string NewPost(string blogId, BlogPost post, INewCategoryContext newCategoryContext, bool publish, out string etag, out XmlDocument remotePost)
@@ -394,7 +416,7 @@ namespace OpenLiveWriter.BlogClient.Clients
             var getPagesRequest = GetService().Pages.List(blogId);
 
             var pageList = getPagesRequest.Execute();
-            return pageList.Items.Select(p => ConvertToPageInfo(p)).ToArray();
+            return pageList.Items?.Select(ConvertToPageInfo).ToArray() ?? new PageInfo[0];
         }
 
         public BlogPost[] GetPages(string blogId, int maxPages)
@@ -403,7 +425,7 @@ namespace OpenLiveWriter.BlogClient.Clients
             getPagesRequest.MaxResults = maxPages;
 
             var pageList = getPagesRequest.Execute();
-            return pageList.Items.Select(p => ConvertToBlogPost(p)).ToArray();
+            return pageList.Items?.Select(ConvertToBlogPost).ToArray() ?? new BlogPost[0];
         }
 
         public string NewPage(string blogId, BlogPost page, bool publish, out string etag, out XmlDocument remotePost)
@@ -834,5 +856,22 @@ namespace OpenLiveWriter.BlogClient.Clients
 
         #endregion
 
+        public class Category
+        {
+            [JsonProperty("term")]
+            public string Term { get; set; }
+        }
+
+        public class Feed
+        {
+            [JsonProperty("category")]
+            public Category[] CategoryArray { get; set; }
+        }
+
+        public class CategoryResponse
+        {
+            [JsonProperty("feed")]
+            public Feed Feed { get; set; }
+        }
     }
 }
diff --git a/src/managed/OpenLiveWriter.BlogClient/Providers/BlogProvidersB5.xml b/src/managed/OpenLiveWriter.BlogClient/Providers/BlogProvidersB5.xml
index 9f879d16..82143bbe 100644
--- a/src/managed/OpenLiveWriter.BlogClient/Providers/BlogProvidersB5.xml
+++ b/src/managed/OpenLiveWriter.BlogClient/Providers/BlogProvidersB5.xml
@@ -130,7 +130,7 @@
       <futurePublishDateWarning>No</futurePublishDateWarning>
       <defaultView>WebLayout</defaultView>
       <invalidPostIdFaultCodePattern>^404$</invalidPostIdFaultCodePattern>
-      <supportsMultipleCategories>No</supportsMultipleCategories>
+      <supportsMultipleCategories>Yes</supportsMultipleCategories>
       <supportsEmptyTitles>Yes</supportsEmptyTitles>
       <requiresHtmlTitles>Yes</requiresHtmlTitles>
       <usePicasaImgMaxAlways>Yes</usePicasaImgMaxAlways>
diff --git a/testplan/addBlogAccts/addGoogle.md b/testplan/addBlogAccts/addGoogle.md
new file mode 100644
index 00000000..795459bb
--- /dev/null
+++ b/testplan/addBlogAccts/addGoogle.md
@@ -0,0 +1,29 @@
+#Test Plan for Ensuring that Adding a Google works properly
+Steps                 | Desired Results                | Complete | Comments
+----------------------|--------------------------------|----------| --------
+Click Home | | |
+Click Options | | |
+Click Account | | | 
+Click Add | | |
+Select Google Blogger | Ensure that dialog box matches below | | 
+Click SignIn | Ensure that browser opens to google login | | 
+Login to google | Ensure that user can allow OpenLiveWriter to use blogger and photos | | This is dependent on Google to some extent
+ | Ensure verification code is received | | 
+ | Ensure windows closes | | 
+ | Ensure blogger account is set up | | 
+ | Ensure "Your Blog has been setup" displays and matches below | |
+Click on Privacy Policy | Ensure that browser opens to the privacy policy | | 
+Click Cancel | Ensure that canceling works and user is returned to accounts dialog box | |
+Click Add | | |
+Select Google Blogger | Ensure that dialog box matches below | | 
+Click SignIn | Ensure that browser opens to google login | | 
+Login to google | Ensure that user can allow OpenLiveWriter to use blogger and photos | | This is dependent on Google to some extent
+ | Ensure verification code is received | | 
+ | Ensure windows closes | | 
+ | Ensure blogger account is set up | | 
+ | Ensure "Your Blog has been setup" displays and matches below | | 
+Change the nickname | Ensure that changing the nickname works | |
+Click Finish | Ensure that blog exists in accounts | |
+ 
+![Google Login dialog box](images/googleLogin.png)
+![Confirm save and change nickname dialog box](images/confirmNickname.png)
diff --git a/testplan/addBlogAccts/addTypepad.md b/testplan/addBlogAccts/addTypepad.md
new file mode 100644
index 00000000..1b5488b0
--- /dev/null
+++ b/testplan/addBlogAccts/addTypepad.md
@@ -0,0 +1,30 @@
+#Test Plan for Ensuring that Adding a Typepad account works properly
+Steps                 | Desired Results                | Complete | Comments
+----------------------|--------------------------------|----------| --------
+Click Home | | |
+Click Options | | |
+Click Account | | | 
+Click Add | | |
+Select Other Services | Ensure that dialog box matches below | | 
+Fill in the boxes incorrectly | Ensure that select blog type dialog box matches below | | 
+Click Cancel | Ensure that the user is returned to the Accounts dialog box | |
+Click Add | | |
+Select Other Services | Ensure that dialog box matches below | | 
+Fill in the first box incorrectly but enter a correct userid and password | Ensure that select blog type dialog box matches below | |
+Select Typepad | | | 
+Click Next | Ensure that all of the blogs for the associated username and password are displayed | |
+Select a blog | | |
+Click Next | Ensure that the blog is setup | | 
+Click Cancel | Ensure that the user is returned to the Accounts dialog box | |
+Click Add | | |
+Select Typepad | Ensure that dialog box matches below | | 
+Fill in the boxes correctly | According to how Typepad is configured, either all blogs or only the one will be displayed | | 
+ | Ensure that downloading the theme is an option | | 
+ | Ensure "Your Blog has been setup" displays and matches below | | 
+Change the nickname | Ensure that changing the nickname works | |
+Click Finish | Ensure that blog exists in accounts | |
+ 
+![Wordpress Login dialog box](images/typepadLogin.png)
+![Select blog type](images/selectBlogType.png)
+![Select log](images/typepadSelectBlog.png)
+![Confirm save and nickname dialog box](images/confirmNickname.png)
diff --git a/testplan/addBlogAccts/addWordPress.md b/testplan/addBlogAccts/addWordPress.md
new file mode 100644
index 00000000..52467f49
--- /dev/null
+++ b/testplan/addBlogAccts/addWordPress.md
@@ -0,0 +1,21 @@
+#Test Plan for Ensuring that adding a WordPress account works properly
+Steps                 | Desired Results                | Complete | Comments
+----------------------|--------------------------------|----------| --------
+Click Home | | |
+Click Options | | |
+Click Account | | | 
+Click Add | | |
+Select Wordpress | Ensure that dialog box matches below | | 
+Fill in the boxes incorrectly | Ensure that select blog type dialog box matches below | | 
+Click Cancel | Ensure that the user is returned to the Accounts dialog box | |
+Click Add | | |
+Select Wordpress | Ensure that dialog box matches below | | 
+Fill in the boxes correctly | Ensure WordPress account is set up | | 
+ | Ensure that downloading the theme is an option | | 
+ | Ensure "Your Blog has been setup" displays and matches below | | 
+Change the nickname | Ensure that changing the nickname works | |
+Click Finish | Ensure that blog exists in accounts | |
+ 
+![Wordpress Login dialog box](images/wordpressLogin.png)
+![Select blog type](images/selectBlogType.png)
+![Confirm save and nickname dialog box](images/confirmNickname.png)
diff --git a/testplan/addBlogAccts/images/confirmNickname.png b/testplan/addBlogAccts/images/confirmNickname.png
new file mode 100644
index 00000000..149f0aea
Binary files /dev/null and b/testplan/addBlogAccts/images/confirmNickname.png differ
diff --git a/testplan/addBlogAccts/images/googleLogin.png b/testplan/addBlogAccts/images/googleLogin.png
new file mode 100644
index 00000000..accdb6ac
Binary files /dev/null and b/testplan/addBlogAccts/images/googleLogin.png differ
diff --git a/testplan/addBlogAccts/images/selectBlogType.png b/testplan/addBlogAccts/images/selectBlogType.png
new file mode 100644
index 00000000..cf236719
Binary files /dev/null and b/testplan/addBlogAccts/images/selectBlogType.png differ
diff --git a/testplan/addBlogAccts/images/typepadLogin.png b/testplan/addBlogAccts/images/typepadLogin.png
new file mode 100644
index 00000000..c93a2ffa
Binary files /dev/null and b/testplan/addBlogAccts/images/typepadLogin.png differ
diff --git a/testplan/addBlogAccts/images/typepadSelectBlog.png b/testplan/addBlogAccts/images/typepadSelectBlog.png
new file mode 100644
index 00000000..b8e2c0c6
Binary files /dev/null and b/testplan/addBlogAccts/images/typepadSelectBlog.png differ
diff --git a/testplan/addBlogAccts/images/wordpressLogin.png b/testplan/addBlogAccts/images/wordpressLogin.png
new file mode 100644
index 00000000..eded48ed
Binary files /dev/null and b/testplan/addBlogAccts/images/wordpressLogin.png differ
diff --git a/testplan/images/plugsinDialogbox.png b/testplan/images/pluginsDialogbox.png
similarity index 100%
rename from testplan/images/plugsinDialogbox.png
rename to testplan/images/pluginsDialogbox.png
diff --git a/testplan/observePlugInOptions.md b/testplan/observePlugInOptions.md
index 83f1e083..ee7cb282 100644
--- a/testplan/observePlugInOptions.md
+++ b/testplan/observePlugInOptions.md
@@ -2,12 +2,14 @@
 Steps                 | Desired Results                | Complete | Comments
 ----------------------|--------------------------------|----------| --------
 Open Live Writer | | |
-Click on Plug-in options | Ensure Options dialog box openns | |
-| Ensure that Plug-ins tab is selected
+Click on Plug-in options | Ensure Options dialog box opens | |
+| Ensure that Plug-ins tab is selected | | 
 | Click Cancel | Ensure dialog box closes | | 
 | Click on File Tab | |
 | Click on Options | |
 | Click on Plug-ins Tab | Ensure that Plug-ins tab is open and selected | |
-| Observe below image | Ensure image matches 
+| Observe below image | Ensure image matches | | 
 
-![Options Plug-ins](images/plugsinDialogbox.png)
+![Options Plug-ins](images/pluginsDialogbox.png)
+
+See (../observePlugInOptions.md) for further testing
\ No newline at end of file
diff --git a/testplan/observeFileTab.md b/testplan/testFile/observeFileTab.md
similarity index 100%
rename from testplan/observeFileTab.md
rename to testplan/testFile/observeFileTab.md
diff --git a/testplan/observeOpenDialogBox.md b/testplan/testFile/observeOpenDialogBox.md
similarity index 94%
rename from testplan/observeOpenDialogBox.md
rename to testplan/testFile/observeOpenDialogBox.md
index 2ee94d2d..2898b1fc 100644
--- a/testplan/observeOpenDialogBox.md
+++ b/testplan/testFile/observeOpenDialogBox.md
@@ -25,7 +25,7 @@ Open Open Live Writer | | |
 Click on File | | |
 Click on Open Recently Posted | Observe dialog box as below | |
  | Observe that Recently Posted is highlighted and that recent posts are available to open | |
-
+ | | | 
 Click on the number next to Show: | Ensure that Show changes the number of posts to be selected | | 
 Select a Recently Posted post | | |
 Click on Delete | Ensure that the post is properly deleted | |
@@ -40,7 +40,7 @@ Click on Open Recently Posted | Enter a term in Filter and hit enter | Observe t
 Open Open Live Writer | | | 
 Click on File | | |
 Click on Open Recently Posted | Observe dialog box as below | | 
-Click on one of the Recently Posted posts | Observe that correct post is loaded
+Click on one of the Recently Posted posts | Observe that correct post is loaded | | 
  |  |  | 
 Open Open Live Writer | | | 
 Click on File | | |
@@ -60,6 +60,7 @@ Enter a term in Filter and hit enter | Observe that appropriate posts are loaded
 Open Open Live Writer | | | 
 Click on File | | |
 Click on any available blog | Observe dialog box as below | | 
-Click on one of the posts | Observe that correct post is loaded
+Click on one of the posts | Observe that correct post is loaded | |
  |  |  | 
+ 
  ![Open diaglog box ](images/openDialogbox.png)
\ No newline at end of file
diff --git a/testplan/observeFind.md b/testplan/testHomeTab/observeFind.md
similarity index 100%
rename from testplan/observeFind.md
rename to testplan/testHomeTab/observeFind.md
diff --git a/testplan/observeHomeTab.md b/testplan/testHomeTab/observeHomeTab.md
similarity index 100%
rename from testplan/observeHomeTab.md
rename to testplan/testHomeTab/observeHomeTab.md
diff --git a/testplan/observeWordCount.md b/testplan/testHomeTab/observeWordCount.md
similarity index 100%
rename from testplan/observeWordCount.md
rename to testplan/testHomeTab/observeWordCount.md
diff --git a/testplan/InstallAsNew.md b/testplan/testInstall/InstallAsNew.md
similarity index 100%
rename from testplan/InstallAsNew.md
rename to testplan/testInstall/InstallAsNew.md
diff --git a/testplan/InstallAsUpdate.md b/testplan/testInstall/InstallAsUpdate.md
similarity index 100%
rename from testplan/InstallAsUpdate.md
rename to testplan/testInstall/InstallAsUpdate.md
diff --git a/testplan/testOptionsDialogBox/images/accountsDialogBox.png b/testplan/testOptionsDialogBox/images/accountsDialogBox.png
new file mode 100644
index 00000000..6e11401b
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/accountsDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/addAutomaticLinkDialogBox.png b/testplan/testOptionsDialogBox/images/addAutomaticLinkDialogBox.png
new file mode 100644
index 00000000..7fe6b814
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/addAutomaticLinkDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/automaticLinkingDialogBox.png b/testplan/testOptionsDialogBox/images/automaticLinkingDialogBox.png
new file mode 100644
index 00000000..854d13e8
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/automaticLinkingDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/editingDialogBox.png b/testplan/testOptionsDialogBox/images/editingDialogBox.png
new file mode 100644
index 00000000..065899a3
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/editingDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/optionsDialogBox.png b/testplan/testOptionsDialogBox/images/optionsDialogBox.png
new file mode 100644
index 00000000..72989d60
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/optionsDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/pingServersdialogbox.png b/testplan/testOptionsDialogBox/images/pingServersdialogbox.png
new file mode 100644
index 00000000..1fca63a5
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/pingServersdialogbox.png differ
diff --git a/testplan/testOptionsDialogBox/images/preferencesDialogBox.png b/testplan/testOptionsDialogBox/images/preferencesDialogBox.png
new file mode 100644
index 00000000..7aab9456
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/preferencesDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/trustCenterDialogBox.png b/testplan/testOptionsDialogBox/images/trustCenterDialogBox.png
new file mode 100644
index 00000000..59997982
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/trustCenterDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/images/webProxyDialogBox.png b/testplan/testOptionsDialogBox/images/webProxyDialogBox.png
new file mode 100644
index 00000000..5877bf7a
Binary files /dev/null and b/testplan/testOptionsDialogBox/images/webProxyDialogBox.png differ
diff --git a/testplan/testOptionsDialogBox/observeAccounts.md b/testplan/testOptionsDialogBox/observeAccounts.md
new file mode 100644
index 00000000..25ba9f84
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observeAccounts.md
@@ -0,0 +1,46 @@
+###Test Plan for Ensuring Automatic Linking dialog box displays correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Accounts | Ensure that Accounts tab is selected and matches below | |
+Unselect checkbox "Automatically update account information " | | 
+Click on OK | | 
+Click on File | | | 
+Click on Options | | |
+Click on Accounts | Ensure that checkbox "Automatically ... " is unchecked | |
+Select checkbox "Automatically update account information " | | 
+Click on OK | | 
+Click on File | | | 
+Click on Options | | |
+Click on Accounts | Ensure that checkbox "Automatically ... " is checked | |
+Click on File | | | 
+Click on Options | | |
+Click on Accounts | Ensure that Accounts tab is selected and matches below | |
+Unselect checkbox "Allow blog provider extensions" | | 
+Click on OK | | 
+Click on File | | | 
+Click on Options | | |
+Click on Accounts | Ensure that checkbox "Automatically ... " is unchecked | |
+Select checkbox "Allow blog provider extensions" | | 
+Click on OK | | 
+Click on File | | | 
+Click on Options | | |
+Click on Accounts | Ensure that checkbox "Allow blog provider extensions " is checked | |
+Click on a Blog Account | | |
+Click on View | Ensure that browser opens at blog main page | | 
+Click on Edit | Ensure that Blog Options dialog box opens with current blog options | |
+Click on Cancel | 
+Click on Add | Ensure that Add a blog account dialog box opens | | 
+Click on Cancel |
+Click on Remove | Ensure that "Are yu sure you want to remove this blog from Writer? appears | | 
+Click on No | Ensure that message box closes and no changes to accounts is made | | 
+Click on Remove | Ensure that "Are yu sure you want to remove this blog from Writer? appears | | 
+Click on Yes | Ensure that blog account is deleted | | 
+Click on OK |
+Click on File | | |
+Click on Options | | | 
+Click on Accounts | Ensure proper accounts are listed | | 
+
+![Options Accounts tab](images/accountsDialogBox.png)
\ No newline at end of file
diff --git a/testplan/testOptionsDialogBox/observeAutomaticLinking.md b/testplan/testOptionsDialogBox/observeAutomaticLinking.md
new file mode 100644
index 00000000..93fd842a
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observeAutomaticLinking.md
@@ -0,0 +1,79 @@
+###Test Plan for Ensuring Automatic Linking dialog box displays correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Automatic Linking | Ensure dialog box matches below, note that you may have entries | | 
+Toggle Automatic Linking Options to off | Ensure that link is greyed out | |
+Click on Cancel | | |
+Click on File | | | 
+Click on Options | | | 
+Click on Automatic Linking | Ensure that both Automatic Linking and Link to Each Term is on | | *This seems to be default behavior*
+Toggle off Link to Each Term | | |
+Click Apply | Ensure that dialog box stays the same | |
+Click OK | | | 
+Click on File | | | 
+Click on Options | | | 
+Click on Automatic Linking | Ensure that both Automatic Linking is on and Link to Each Term is off | | 
+Click off Automatically Link | |
+Click on Ok | | |
+Click on File | | | 
+Click on Options | | | 
+Click on Automatic Linking | Ensure that both Automatic Linking is off and Link to Each Term is off | | 
+Toggle Automatically Link to On | Ensure that Automatic Linking is on and Link to Each Term is on | |
+Click on OK | | | 
+Click on File | | | 
+Click on Options | | | 
+Click on Automatic Linking | Ensure that both Automatic Linking is on and Link to Each Term is on | | 
+Click on OK | | |
+| | | |
+Click on Add | Ensure Add Automatic Link dialog appears and matches below | |
+Click OK | Ensure error message appears - Enter the text to display hyperlink | | 
+Add Text | Ensure it appears | | 
+Click OK | Ensure error message appears - Enter a valid hyperlink | | 
+Add valid hyperlink | Ensure it appears | |
+Click OK | Ensure the new information appears on the Automatic Linking Dialog Box and it is highlighted | |
+Click on Edit | Ensure Edit Automatic Link Dialog box appears (same as add, only edit in title) | |
+| Ensure information is correct | | 
+Edit text | Ensure information is changed | | 
+Edit hyperlink | Ensure information is changed | | 
+Click OK | Ensure new information is in Automatic Link Dialog box | | 
+ | Ensure that that current entry is highlighted | | 
+Click on Edit | Ensure Edit Automatic Link Dialog box appears (same as add, only edit in title) | |
+Click on Cancel | Ensure that box closes | |
+ | Ensure that current entry is highlighted | | 
+ | Ensure that entry does not change | | 
+Click on Remove | Ensure Are you sure that you want to delete this auto-link entry? displays | | 
+Click on No | Ensure message box closes | | 
+ | Ensure nothing is selected | | *Seems to be default behavior* 
+Click on a entry | Ensure entry is highlighted | | 
+Click on Remove | Ensure Are you sure that you want to delete this auto-link entry? displays | | 
+Click on Yes | Ensure entry is deleted | | 
+| | |
+**Ensure advanced options is working** | | |
+Click on File | | |
+Click on Options | | | 
+Click on Automatic Linking | | | 
+Click on Add | | | 
+Click on Advanced | Ensure that the dialog box is expanded | |
+| Ensure Title field is available | | 
+| Ensure that Rel field is available | | 
+| Fill in all options correctly | | 
+Click on OK | | | 
+Click on Edit | Ensure that the entry is filled out correctly | |
+Click OK or cancel | | | 
+Select an exisitng entry without advanced options | | 
+Click on Edit | | |
+Click on Advanced | | | 
+| Fill in all options correctly | | 
+Click on OK | | | 
+Click on Edit | Ensure that the entry is filled out correctly | |
+| | |
+**Ensure automatic linking is working** | | |
+Enter at least one automatic linking term and address | | |
+Create a blog post with at least one of the term, the hyperlink should be created automatically as you type | | | 
+
+![Automatic Linking Dialog Box](images/automaticLinkingDialogBox.png)
+
+![Add Automatic Link Dialog Box](images/addAutomaticLinkDialogBox.png)
\ No newline at end of file
diff --git a/testplan/testOptionsDialogBox/observeEditing.md b/testplan/testOptionsDialogBox/observeEditing.md
new file mode 100644
index 00000000..ad1a2a87
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observeEditing.md
@@ -0,0 +1,57 @@
+###Test Plan for Editing dialog box displays correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+Deselect Replace hyphens | | |
+Click Apply | Ensure checkbox remains off | |
+Deselect Replace quotes | | |
+Click Apply | Ensure checkbox remains off | |
+Deselect Replace other special characters | | |
+Click Apply | Ensure checkbox remains off | | 
+Deselect Replace emicons | | |
+Click Apply | Ensure checkbox remains off | | 
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+| Ensure all check boxes are off | | 
+Select Replace hyphens | Ensure check box is selected | |
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+| Ensure Replace hyphen is on, others are off  | | 
+Deselect Replace hyphens | | |
+Select Replace quotes | | |
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+| Ensure Replace quotes is on, others are off  | | 
+Deselect Replace quotes | | |
+Select Replace other characters | | | 
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+| Ensure Replace other characters is on, others are off  | | 
+Deselect Replace other characters | | |
+Select Replace emoticons| | | 
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+| Ensure Replace emoticons is on, others are off  | | 
+Select Replace hyphens | | | 
+Select Replace quotes | | |
+Select Replace other characters | | | 
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Editing | Ensure Editing dialog box resembles below | |
+| Ensure all checkboxes are on  | | 
+
+![Options Editing tab](images/editingDialogBox.png)
\ No newline at end of file
diff --git a/testplan/testOptionsDialogBox/observeOptionsDialogBox.md b/testplan/testOptionsDialogBox/observeOptionsDialogBox.md
new file mode 100644
index 00000000..93aa3d72
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observeOptionsDialogBox.md
@@ -0,0 +1,9 @@
+###Test Plan for Ensuring Options dialog box displays correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | Ensure that the dialog box matches image below  | |
+| | | 
+
+![Options Dialog Box](images/optionsDialogBox.png)
diff --git a/testplan/testOptionsDialogBox/observePingServers.md b/testplan/testOptionsDialogBox/observePingServers.md
new file mode 100644
index 00000000..9e7cf2e4
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observePingServers.md
@@ -0,0 +1,22 @@
+###Test Plan for Ensuring Ping Servers tab works correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Ping Servers | Ensure Ping Servers dialog box matches below | |
+Toggle checkbox to off | Ensure text block is grayed out | |
+Toggle checkbox to on | Ensure text block is white and available for editing | |
+Enter at least one ping server | |  |
+Click Cancel | | | 
+Click File | | |
+Click Options | | |
+Click Ping Servers | Changes should not have been retained | | |
+Enter at least one ping server | | |
+Click Apply | Ensure that changes were made | | 
+Click OK | Options dialog box closes | | 
+Click File | | |
+Click Options | | | 
+Click Ping Servers | Changes should have been retained | | 
+  
+![Ping Servers Dialog Box](images/pingServersDialogBox.png)
diff --git a/testplan/testOptionsDialogBox/observePlugsin.md b/testplan/testOptionsDialogBox/observePlugsin.md
new file mode 100644
index 00000000..d4500ad0
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observePlugsin.md
@@ -0,0 +1,12 @@
+###Test Plan for Ensuring Plug-ins tab works correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Plug-ins | Ensure that Plug-Ins Box is open | | 
+ | Ensure that Plug-Ins Box matches below 
+ 
+ ![Plug-ins dialog box](../images/pluginsDialogBox.png)
+
+See (../observePlugInOptions.md) for the rest of the test plan
\ No newline at end of file
diff --git a/testplan/testOptionsDialogBox/observePreferences.md b/testplan/testOptionsDialogBox/observePreferences.md
new file mode 100644
index 00000000..6daedfaf
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observePreferences.md
@@ -0,0 +1,172 @@
+###Test Plan for Ensuring Options Preferences dialog box displays correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Preferences | Ensure that the dialog box matches image below  | | *Note that this is the default when selecting options*
+**Test Post Window** | | | 
+Deselect all check boxes | | |
+Click Apply | | | 
+Select "Use a single window .." | | |
+Click OK | | | 
+Click on File | | | 
+Click on Options | | |
+Click on Preferences | Ensure that the dialog box has only the radio box "Use a single window"  | | 
+Click on OK | | |
+Have an empty post | | | 
+Click on New Post | Ensure stays in the same window | |
+Start a blog post | | | 
+Click on New Post | Ensure that dialog box to save post displays | | 
+Save Post | Ensure windows stays open with a blank post | | 
+Click on File | | | 
+Click on Options | | |
+Click on Preferences | Ensure that the dialog box matches image below  | | *Note that this is the default when selecting options*
+Select "Open a new window for each post" | | |
+Click on OK | | | 
+Click on New Post | Ensure that another Open Writer windows opens | | 
+Click on File | | | 
+Click on Options | | |
+Click on Preferences | Ensure only "Open a new window for each post" is selected | |
+Click on OK | | |
+Create a new post | | | 
+Save it | | | 
+Click on File | | |
+Click on New Post | Ensure that saved post is closed and new post is in the same window | | 
+**Test Publishing ** | | |
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Select "View Post after publishing | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Write a blog post | | | 
+Publish | Observe blog post open in browswer window | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+DeSelect "View Post after publishing | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Edit blog post | | | 
+Publish | Observe that blog post does not open in browswer window | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Select "Close window after publishing | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Write a blog post | | | 
+Publish | Observe Windows Writer window close after publishing  | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Deselect "Close window after publishing| | |
+Delect all other check boxes | | | 
+Click OK | | |
+Edit blog post | | | 
+Publish | Observe that Windows Live Explorer remains open | | |  
+| | | 
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Select "Close window after publishing" | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Write a blog post | | | 
+Publish | Observe Open Live Writer window closes after publishing  | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Deselect "Close window after publishing" | | |
+Delect all other check boxes | | | 
+Click OK | | |
+Edit blog post | | | 
+Publish | Observe that Open Live Writer window remains  | | |  
+| | | 
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Select "Remind me to type a title before publishing" | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Write a blog post - omit the title | | | 
+Publish | Observe title reminder message box | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Deselect "Remind me to type a title before publishing" | | |
+Delect all other check boxes | | | 
+Click OK | | |
+Edit blog post | | | 
+Publish | Observe no title reminder | | |  
+| | | 
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button 'Remind me to add categories before publishing" | | | Appears to be default behavior
+Select "Close window after publishing | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Write a blog post omitting categories | | | 
+Publish | Observe missing categories dialog box  | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Remind me to add categories before publishing" | | | Appears to be default behavior
+Deselect "Close window after publishing| | |
+Delect all other check boxes | | | 
+Click OK | | |
+Edit blog post | | | 
+Publish | Observe no categories message box | | |  
+| | |
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Remind me to add tags before publishing"  | | | Appears to be default behavior
+Select "Close window after publishing | | |
+Deselect all other check boxes | | | 
+Click OK | | |
+Write a blog post | | | 
+Publish | Observe Observe missing tag dialog box  | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Remind me to add tags before publishing" | | | Appears to be default behavior
+Deselect "Close window after publishing| | |
+Delect all other check boxes | | | 
+Click OK | | |
+Edit blog post | | | 
+Publish | Observe no tag message box | | |  
+| | | 
+**Test General Options** | | | 
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Select "Save AutoRecover information periodically" | | |
+Click OK | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | Observe Save Autorecover check | | 
+Click on File | | |
+Click on Options | | |
+Click on Preferences | | | Appears to be default behavior
+Select Radio button "Open a new window for each post" | | | Appears to be default behavior
+Select "Show real-time word count in status bar" | | |
+Click OK | | |  
+Click on File | | |
+Click on Options | | |
+Click on Preferences | Observe Save Autorecover check | | 
+Click on OK | | |
+Write blog post | Ensure word count is updated | | 
+
+![Options Dialog Box](images/preferencesDialogBox.png)
diff --git a/testplan/testOptionsDialogBox/observeTrustCenter.md b/testplan/testOptionsDialogBox/observeTrustCenter.md
new file mode 100644
index 00000000..ab72ba77
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observeTrustCenter.md
@@ -0,0 +1,13 @@
+###Test Plan for Ensuring Trust Center tab works correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Trust Center| Ensure Trust Center dialog box matches below | |
+Click on .NET Foundation Privacy Policy | Ensure browser opens to correct web page | | 
+ | http://www.dotnetfoundation.org/privacy-policy | |
+Click on .NET Foundation Contributor Code of Code | Ensure browser opens to correct web page | | 
+ | http://www.dotnetfoundation.org/code-of-conduct | | 
+ 
+![Trust Center Dialog Box](images/trustCenterDialogBox.png)
diff --git a/testplan/testOptionsDialogBox/observeWebProxy.md b/testplan/testOptionsDialogBox/observeWebProxy.md
new file mode 100644
index 00000000..fdc50cbe
--- /dev/null
+++ b/testplan/testOptionsDialogBox/observeWebProxy.md
@@ -0,0 +1,24 @@
+###Test Plan for Ensuring Web Proxy tab works correctly
+Steps                  | Desired Results                | Complete | Comments
+--------------------------|--------------------------------------------|----------| --------
+Open Open Live Writer  |  |  |
+Click on File | | | 
+Click on Options | | |
+Click on Web Proxy | Ensure Web Proxy dialog box matches below | |
+Toggle checkbox to off | Ensure text block is grayed out | |
+Toggle checkbox to on | Ensure settings boxes are white and available for editing | |
+Enter at least one setting | |  |
+Click Cancel | | | 
+Click File | | |
+Click Options | | |
+Click Web Proxy | Changes should not have been retained | | |
+Enter all settings | | |
+Click Apply | Ensure that changes were made | | 
+Click OK | Options dialog box closes | | 
+Click File | | |
+Click Options | | | 
+Click Web Proxy | Changes should have been retained | | 
+  
+  Note: Currently no error checking is done, this only saves what the user put in.
+  
+![Web Proxy Dialog Box](images/webProxyDialogBox.png)