diff --git a/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs b/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs
index 410f886..b694beb 100644
--- a/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs
+++ b/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs
@@ -63,19 +63,14 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
             _db.Insert(POSITION_TABLE_NAME, null, GetPositionContentValues(position));
         }
 
-
         public void DeletePortfolio(string portfolioName)
         {
             _db.BeginTransaction();
             try
             {
                 var portfolio = GetPortfolioByName(portfolioName);
-                Log.E("DeletePortfolio", "Name: " + portfolio.Name);
-                Log.E("DeletePortfolio", "Name: " + portfolio.ID);
-                _db.RawQuery("DELETE FROM " + PORTFOLIO_TABLE_NAME + " WHERE id = " + portfolio.ID, null);
-                _db.RawQuery("DELETE FROM " + POSITION_TABLE_NAME + " WHERE ContainingPortfolioID = " + portfolio.ID, null);
-                //_db.Delete(PORTFOLIO_TABLE_NAME, " WHERE id = " + portfolio.ID, null);
-                //_db.Delete(POSITION_TABLE_NAME, " WHERE ContainingPortfolioID = " + portfolio.ID, null);
+                _db.Delete(PORTFOLIO_TABLE_NAME, "id = " + portfolio.ID, null);
+                _db.Delete(POSITION_TABLE_NAME, "ContainingPortfolioID = " + portfolio.ID, null);
                 _db.SetTransactionSuccessful();
             }
             catch (SQLiteException ex)
@@ -137,12 +132,12 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
         private void UpdateExistingPortfolio(Portfolio portfolio)
         {
             var portfolioID = portfolio.ID ?? -1;
-            _db.Update(PORTFOLIO_TABLE_NAME, GetPortfolioContentValues(portfolio), " WHERE id = " + portfolioID, null);
+            Log.E("UpdateExistingPortfolio", "Portfolios updated: " + _db.Update(PORTFOLIO_TABLE_NAME, GetPortfolioContentValues(portfolio), "id = " + portfolioID, null));
         }
 
         private void InsertNewPortfolio(Portfolio portfolio)
         {
-            _db.Insert(PORTFOLIO_TABLE_NAME, null, GetPortfolioContentValues(portfolio));
+            Log.E("InsertNewPortfolio", "Portfolios inserted: " + _db.Insert(PORTFOLIO_TABLE_NAME, null, GetPortfolioContentValues(portfolio)));
         }
 
         private static ContentValues GetPortfolioContentValues(Portfolio portfolio)
diff --git a/MonoStockPortfolio/AddPortfolioActivity.cs b/MonoStockPortfolio/AddPortfolioActivity.cs
deleted file mode 100644
index 77706c6..0000000
--- a/MonoStockPortfolio/AddPortfolioActivity.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using Android.App;
-using Android.Content;
-using Android.OS;
-using Android.Widget;
-using MonoStockPortfolio.Core.PortfolioRepositories;
-using MonoStockPortfolio.Entities;
-
-namespace MonoStockPortfolio
-{
-    [Activity(Label = "Add Portfolio", MainLauncher = false)]
-    public class AddPortfolioActivity : Activity
-    {
-        public static string ClassName { get { return "monostockportfolio.AddPortfolioActivity"; } }
-        private IPortfolioRepository _repo; 
-
-        protected override void OnCreate(Bundle bundle)
-        {
-            base.OnCreate(bundle);
-
-            _repo = new AndroidSqlitePortfolioRepository(this);
-
-            SetContentView(Resource.layout.addportfolio);
-
-            WireUpEvents();
-        }
-
-        private void WireUpEvents()
-        {
-            var saveButton = FindViewById<Button>(Resource.id.btnSave);
-            saveButton.Click += saveButton_Click;
-        }
-
-        private void saveButton_Click(object sender, EventArgs e)
-        {
-            var portfolioName = FindViewById<EditText>(Resource.id.portfolioName);
-
-            _repo.SavePortfolio(new Portfolio {Name = portfolioName.Text.ToString()});
-
-            Toast.MakeText(this, "You saved: " + portfolioName.Text, ToastLength.Short).Show();
-
-            var intent = new Intent();
-            SetResult(Result.Ok, intent);
-            Finish();
-        }
-    }
-}
\ No newline at end of file
diff --git a/MonoStockPortfolio/EditPortfolioActivity.cs b/MonoStockPortfolio/EditPortfolioActivity.cs
new file mode 100644
index 0000000..68cffa8
--- /dev/null
+++ b/MonoStockPortfolio/EditPortfolioActivity.cs
@@ -0,0 +1,108 @@
+using System;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Widget;
+using MonoStockPortfolio.Core.PortfolioRepositories;
+using MonoStockPortfolio.Entities;
+using MonoStockPortfolio.Validation;
+
+namespace MonoStockPortfolio
+{
+    [Activity(Label = "Add Portfolio", MainLauncher = false)]
+    public class EditPortfolioActivity : Activity
+    {
+        public static string ClassName { get { return "monostockportfolio.EditPortfolioActivity"; } }
+        public static string Extra_PortfolioID { get { return "monoStockPortfolio.EditPortfolioActivity.PortfolioID"; } }
+
+        private Button SaveButton { get { return FindViewById<Button>(Resource.id.btnSave); } }
+        private EditText PortfolioName { get { return FindViewById<EditText>(Resource.id.portfolioName); } }
+
+        private IPortfolioRepository _repo; 
+
+        protected override void OnCreate(Bundle bundle)
+        {
+            base.OnCreate(bundle);
+
+            _repo = new AndroidSqlitePortfolioRepository(this);
+
+            SetContentView(Resource.layout.addportfolio);
+
+            WireUpEvents();
+
+            var portfolioId = Intent.GetLongExtra(Extra_PortfolioID, -1);
+            if(portfolioId != -1)
+            {
+                this.Title = "Edit Portfolio";
+                PopulateForm(portfolioId);
+            }
+        }
+
+        private void PopulateForm(long portfolioId)
+        {
+            var portfolio = _repo.GetPortfolioById(portfolioId);
+            PortfolioName.Text = portfolio.Name;
+        }
+
+        private void WireUpEvents()
+        {
+            SaveButton.Click += saveButton_Click;
+        }
+
+        private void saveButton_Click(object sender, EventArgs e)
+        {
+            Portfolio portfolioToSave = GetPortfolioToSave();
+
+            if (Validate(portfolioToSave))
+            {
+                _repo.SavePortfolio(portfolioToSave);
+
+                Toast.MakeText(this, "You saved: " + PortfolioName.Text, ToastLength.Short).Show();
+
+                var intent = new Intent();
+                SetResult(Result.Ok, intent);
+                Finish();
+            }
+        }
+
+        private bool Validate(Portfolio portfolioToSave)
+        {
+            var validator = new FormValidator();
+            validator.AddValidation(PortfolioName, () => IsDuplicateName(portfolioToSave));
+
+            var result = validator.Apply();
+            if(result != string.Empty)
+            {
+                Toast.MakeText(this, result, ToastLength.Long).Show();
+                return false;
+            }
+            return true;
+        }
+
+        private string IsDuplicateName(Portfolio portfolioToSave)
+        {
+            var portfolio = _repo.GetPortfolioByName(portfolioToSave.Name);
+            if(portfolio != null && portfolio.ID != portfolioToSave.ID)
+            {
+                return "Portfolio name is already taken";
+            }
+            return string.Empty;
+        }
+
+        private Portfolio GetPortfolioToSave()
+        {
+            Portfolio portfolioToSave;
+            var portfolioId = Intent.GetLongExtra(Extra_PortfolioID, -1);
+            if (portfolioId != -1)
+            {
+                portfolioToSave = new Portfolio(portfolioId);
+            }
+            else
+            {
+                portfolioToSave = new Portfolio();
+            }
+            portfolioToSave.Name =  PortfolioName.Text.ToString();
+            return portfolioToSave;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio/MainActivity.cs b/MonoStockPortfolio/MainActivity.cs
index 307ba20..8a607ec 100644
--- a/MonoStockPortfolio/MainActivity.cs
+++ b/MonoStockPortfolio/MainActivity.cs
@@ -56,7 +56,8 @@ namespace MonoStockPortfolio
         void PortfolioListView_ItemLongClick(object sender, ItemEventArgs e)
         {
             _longClickOptions = new[] {"Edit", "Delete"};
-            var selectedPortfolio = ((TextView) e.View).Text.ToS();
+            var selectedPortfolioName = ((TextView) e.View).Text.ToS();
+            var selectedPortfolio = _repo.GetPortfolioByName(selectedPortfolioName);
             var dialogBuilder = new AlertDialog.Builder(this);
             dialogBuilder.SetTitle("Options");
             dialogBuilder.SetItems(_longClickOptions,
@@ -64,17 +65,21 @@ namespace MonoStockPortfolio
             dialogBuilder.Create().Show();
         }
 
-        private void tr_LongClick_Options(object sender, DialogClickEventArgs e, string selectedPortfolio)
+        private void tr_LongClick_Options(object sender, DialogClickEventArgs e, Portfolio selectedPortfolio)
         {
             //Toast.MakeText(this, "Option: " + _longClickOptions[e.Which], ToastLength.Long).Show();
             if(_longClickOptions[e.Which] == "Edit")
             {
                 // Edit
+                var intent = new Intent();
+                intent.SetClassName(this, EditPortfolioActivity.ClassName);
+                intent.PutExtra(EditPortfolioActivity.Extra_PortfolioID, selectedPortfolio.ID ?? -1);
+                StartActivityForResult(intent, 0);
             }
             else if (_longClickOptions[e.Which] == "Delete")
             {
                 // Delete
-                _repo.DeletePortfolio(selectedPortfolio);
+                _repo.DeletePortfolio(selectedPortfolio.Name);
                 RefreshList();
             }
         }
@@ -90,7 +95,7 @@ namespace MonoStockPortfolio
         private void addPortfolioButton_Click(object sender, EventArgs e)
         {
             var intent = new Intent();
-            intent.SetClassName(this, AddPortfolioActivity.ClassName);
+            intent.SetClassName(this, EditPortfolioActivity.ClassName);
             StartActivityForResult(intent, 0);
         }
 
diff --git a/MonoStockPortfolio/MonoStockPortfolio.csproj b/MonoStockPortfolio/MonoStockPortfolio.csproj
index d540a74..8a4e021 100644
--- a/MonoStockPortfolio/MonoStockPortfolio.csproj
+++ b/MonoStockPortfolio/MonoStockPortfolio.csproj
@@ -44,7 +44,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AddPortfolioActivity.cs" />
+    <Compile Include="EditPortfolioActivity.cs" />
     <Compile Include="PortfolioActivity.cs" />
     <Compile Include="MainActivity.cs" />
     <Compile Include="AddPositionActivity.cs" />