diff --git a/MonoStockPortfolio.Core/AndroidSqliteBase.cs b/MonoStockPortfolio.Core/AndroidSqliteBase.cs
new file mode 100644
index 0000000..ba939a6
--- /dev/null
+++ b/MonoStockPortfolio.Core/AndroidSqliteBase.cs
@@ -0,0 +1,46 @@
+using Android.Content;
+using Android.Database.Sqlite;
+using Android.Util;
+
+namespace MonoStockPortfolio.Core
+{
+    public abstract class AndroidSqliteBase : SQLiteOpenHelper
+    {
+        public const string PORTFOLIO_TABLE_NAME = "Portfolios";
+        public const string POSITION_TABLE_NAME = "Positions";
+        public const string CONFIG_TABLE_NAME = "Config";
+
+        public const string DATABASE_NAME = "stockportfolio.db";
+        public const int DATABASE_VERSION = 1;
+
+        protected AndroidSqliteBase(Context context)
+            : base(context, DATABASE_NAME, null, DATABASE_VERSION)
+        {
+        }
+
+        protected SQLiteDatabase Db { get { return WritableDatabase; } }
+
+        public override void OnCreate(SQLiteDatabase db)
+        {
+            db.ExecSQL("CREATE TABLE " + PORTFOLIO_TABLE_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, Name TEXT)");
+            db.ExecSQL("CREATE TABLE " + POSITION_TABLE_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, Ticker TEXT, Shares REAL, PricePerShare REAL, ContainingPortfolioID INT)");
+            db.ExecSQL("CREATE TABLE " + CONFIG_TABLE_NAME + " (StockItems TEXT)");
+
+            db.ExecSQL("INSERT INTO " + CONFIG_TABLE_NAME + " (StockItems) VALUES ('2,0,1,3')");
+            db.ExecSQL("INSERT INTO " + PORTFOLIO_TABLE_NAME + " (Name) VALUES ('Sample portfolio')");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('GOOG', '500', '593.97', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('AMZN', '500', '180.00', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('AAPL', '500', '322.56', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('MSFT', '500', '27.91', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('NOVL', '500', '5.92', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('S', '500', '4.23', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('VZ', '500', '35.78', 1)");
+            db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('T', '500', '29.38', 1)");
+        }
+
+        public override void OnUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
+        {
+            Log.Warn("Upgrade", "Nothing to upgrade");
+        }
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/Config/AndroidSqliteConfigRepository.cs b/MonoStockPortfolio.Core/Config/AndroidSqliteConfigRepository.cs
index aa80e5c..588347e 100644
--- a/MonoStockPortfolio.Core/Config/AndroidSqliteConfigRepository.cs
+++ b/MonoStockPortfolio.Core/Config/AndroidSqliteConfigRepository.cs
@@ -1,11 +1,44 @@
 using System.Collections.Generic;
+using System.Linq;
+using Android.Content;
 using MonoStockPortfolio.Entities;
 
 namespace MonoStockPortfolio.Core.Config
 {
-    public class AndroidSqliteConfigRepository : IConfigRepository
+    public class AndroidSqliteConfigRepository : AndroidSqliteBase, IConfigRepository
     {
+        public AndroidSqliteConfigRepository(Context context) : base(context)
+        { }
+
         public IEnumerable<StockDataItem> GetStockItems()
+        {
+            var cursor = Db.Query(CONFIG_TABLE_NAME, new[] { "StockItems" }, null, null, null, null, null);
+            string stockItemsCsv = null;
+            if (cursor.Count > 0)
+            {
+                cursor.MoveToNext();
+                stockItemsCsv = cursor.GetString(0);
+                if (!cursor.IsClosed) cursor.Close();
+            }
+
+            if (string.IsNullOrEmpty(stockItemsCsv))
+            {
+                return DefaultItems();
+            }
+
+            return stockItemsCsv.Split(',').Select(i => (StockDataItem)int.Parse(i));
+        }
+
+        public void UpdateStockItems(List<StockDataItem> stockDataItems)
+        {
+            var stockItemsCsv = string.Join(",", stockDataItems.Select(i => ((int) i).ToString()).ToArray());
+            var contentValues = new ContentValues();
+            contentValues.Put("StockItems", stockItemsCsv);
+            Db.Update(CONFIG_TABLE_NAME, contentValues, null, null);
+        }
+
+        // this should never be called, but it's here anyway in case of some catastrophe
+        private static IEnumerable<StockDataItem> DefaultItems()
         {
             var items = new List<StockDataItem>();
             items.Add(StockDataItem.Ticker);
diff --git a/MonoStockPortfolio.Core/Config/IConfigRepository.cs b/MonoStockPortfolio.Core/Config/IConfigRepository.cs
index d8e2cbf..2cd9755 100644
--- a/MonoStockPortfolio.Core/Config/IConfigRepository.cs
+++ b/MonoStockPortfolio.Core/Config/IConfigRepository.cs
@@ -6,5 +6,6 @@ namespace MonoStockPortfolio.Core.Config
     public interface IConfigRepository
     {
         IEnumerable<StockDataItem> GetStockItems();
+        void UpdateStockItems(List<StockDataItem> stockDataItems);
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/EnumExtensions.cs b/MonoStockPortfolio.Core/EnumExtensions.cs
index dd1e98d..fa8a8a5 100644
--- a/MonoStockPortfolio.Core/EnumExtensions.cs
+++ b/MonoStockPortfolio.Core/EnumExtensions.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using MonoStockPortfolio.Entities;
 
 namespace MonoStockPortfolio.Core
@@ -21,5 +24,16 @@ namespace MonoStockPortfolio.Core
             }
             return string.Empty;
         }
+
+        public static IEnumerable<T> GetValues<T>(this Enum value)
+        {
+            var enumerations = new List<Enum>();
+            var fields = value.GetType().GetFields(BindingFlags.Static | BindingFlags.Public);
+            foreach (var fieldInfo in fields)
+            {
+                enumerations.Add((Enum)fieldInfo.GetValue(value));
+            }
+            return enumerations.Cast<T>();
+        }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/MonoStockPortfolio.Core.csproj b/MonoStockPortfolio.Core/MonoStockPortfolio.Core.csproj
index eaad376..034c91e 100644
--- a/MonoStockPortfolio.Core/MonoStockPortfolio.Core.csproj
+++ b/MonoStockPortfolio.Core/MonoStockPortfolio.Core.csproj
@@ -31,11 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FileHelpers">
-      <HintPath>..\libs\FileHelpers.dll</HintPath>
-    </Reference>
     <Reference Include="Mono.Android" />
-    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -46,14 +42,15 @@
     <Compile Include="Config\IConfigRepository.cs" />
     <Compile Include="DictionaryExtensions.cs" />
     <Compile Include="EnumExtensions.cs" />
+    <Compile Include="AndroidSqliteBase.cs" />
     <Compile Include="PortfolioRepositories\AndroidSqlitePortfolioRepository.cs" />
     <Compile Include="PortfolioRepositories\IPortfolioRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Services\IPortfolioService.cs" />
     <Compile Include="Services\PortfolioService.cs" />
+    <Compile Include="StockData\CsvParser.cs" />
+    <Compile Include="StockData\GoogleStockDataProvider.cs" />
     <Compile Include="StockData\IStockDataProvider.cs" />
-    <Compile Include="StockData\YahooFinanceStockData.cs" />
-    <Compile Include="StockData\YahooStockDataProvider.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MonoStockPortfolio.Entities\MonoStockPortfolio.Entities.csproj">
diff --git a/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs b/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs
index 8881496..f1a8369 100644
--- a/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs
+++ b/MonoStockPortfolio.Core/PortfolioRepositories/AndroidSqlitePortfolioRepository.cs
@@ -7,41 +7,32 @@ using MonoStockPortfolio.Entities;
 
 namespace MonoStockPortfolio.Core.PortfolioRepositories
 {
-    public class AndroidSqlitePortfolioRepository : IPortfolioRepository
+    public class AndroidSqlitePortfolioRepository : AndroidSqliteBase, IPortfolioRepository
     {
-        private OpenHelper _dbHelper;
-        private SQLiteDatabase _db;
-        private const string PORTFOLIO_TABLE_NAME = "Portfolios";
-        private const string DATABASE_NAME = "stockportfolio.db";
-        private const int DATABASE_VERSION = 1;
-        private const string POSITION_TABLE_NAME = "Positions";
-
         public AndroidSqlitePortfolioRepository(Context context)
-        {
-            _dbHelper = new OpenHelper(context, DATABASE_NAME, null, DATABASE_VERSION);
-            _db = _dbHelper.WritableDatabase;
-        }
+            : base(context)
+        { }
 
         public IList<Portfolio> GetAllPortfolios()
         {
             var list = new List<Portfolio>();
-            var cursor = _db.Query(PORTFOLIO_TABLE_NAME, new[] {"id", "Name"}, null, null, null, null, null);
-            if(cursor.Count > 0)
+            var cursor = Db.Query(PORTFOLIO_TABLE_NAME, new[] { "id", "Name" }, null, null, null, null, null);
+            if (cursor.Count > 0)
             {
-                while(cursor.MoveToNext())
+                while (cursor.MoveToNext())
                 {
                     var portfolio = new Portfolio(cursor.GetInt(0));
                     portfolio.Name = cursor.GetString(1);
                     list.Add(portfolio);
                 }
             }
-            if(!cursor.IsClosed) cursor.Close();
+            if (!cursor.IsClosed) cursor.Close();
             return list;
         }
 
         public Portfolio GetPortfolioById(long portfolioId)
         {
-            var cursor = _db.Query(PORTFOLIO_TABLE_NAME, new[] { "id", "Name" }, " ID = " + portfolioId, null, null, null, null);
+            var cursor = Db.Query(PORTFOLIO_TABLE_NAME, new[] { "id", "Name" }, " ID = " + portfolioId, null, null, null, null);
             if (cursor.Count > 0)
             {
                 cursor.MoveToNext();
@@ -67,26 +58,26 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
 
         public void DeletePortfolioById(int portfolioId)
         {
-            _db.BeginTransaction();
+            Db.BeginTransaction();
             try
             {
-                _db.Delete(PORTFOLIO_TABLE_NAME, "id = " + portfolioId, null);
-                _db.Delete(POSITION_TABLE_NAME, "ContainingPortfolioID = " + portfolioId, null);
-                _db.SetTransactionSuccessful();
+                Db.Delete(PORTFOLIO_TABLE_NAME, "id = " + portfolioId, null);
+                Db.Delete(POSITION_TABLE_NAME, "ContainingPortfolioID = " + portfolioId, null);
+                Db.SetTransactionSuccessful();
             }
             catch (SQLiteException)
             {
-                Log.E("DeletePortfolio", "SQLiteException => Id = " + portfolioId);
+                Log.Error("DeletePortfolio", "SQLiteException => Id = " + portfolioId);
             }
             finally
             {
-                _db.EndTransaction();
+                Db.EndTransaction();
             }
         }
 
         public Portfolio GetPortfolioByName(string portfolioName)
         {
-            var cursor = _db.Query(PORTFOLIO_TABLE_NAME, new[] { "id", "Name" }, " Name = '" + portfolioName + "'", null, null, null, null);
+            var cursor = Db.Query(PORTFOLIO_TABLE_NAME, new[] { "id", "Name" }, " Name = '" + portfolioName + "'", null, null, null, null);
             if (cursor.Count > 0)
             {
                 cursor.MoveToNext();
@@ -100,19 +91,19 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
 
         public void DeletePositionById(long positionId)
         {
-            _db.Delete(POSITION_TABLE_NAME, "id = " + positionId, null);
+            Db.Delete(POSITION_TABLE_NAME, "id = " + positionId, null);
         }
 
         public Position GetPositionById(long positionId)
         {
             Position position = null;
 
-            var cursor = _db.Query(POSITION_TABLE_NAME, new[] { "id", "Ticker", "Shares", "PricePerShare" }, " id = " + positionId, null, null, null, null);
+            var cursor = Db.Query(POSITION_TABLE_NAME, new[] { "id", "Ticker", "Shares", "PricePerShare" }, " id = " + positionId, null, null, null, null);
             if (cursor.Count > 0)
             {
                 while (cursor.MoveToNext())
                 {
-                    position= new Position(cursor.GetInt(0));
+                    position = new Position(cursor.GetInt(0));
                     position.Ticker = cursor.GetString(1);
                     position.Shares = Convert.ToDecimal(cursor.GetFloat(2));
                     position.PricePerShare = Convert.ToDecimal(cursor.GetFloat(3));
@@ -126,7 +117,7 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
         {
             var list = new List<Position>();
 
-            var cursor = _db.Query(POSITION_TABLE_NAME, new[] { "id", "Ticker", "Shares", "PricePerShare" }, " ContainingPortfolioID = " + portfolioId, null, null, null, null);
+            var cursor = Db.Query(POSITION_TABLE_NAME, new[] { "id", "Ticker", "Shares", "PricePerShare" }, " ContainingPortfolioID = " + portfolioId, null, null, null, null);
             if (cursor.Count > 0)
             {
                 while (cursor.MoveToNext())
@@ -157,23 +148,23 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
         private void UpdateExistingPortfolio(Portfolio portfolio)
         {
             var portfolioID = portfolio.ID ?? -1;
-            Log.E("UpdateExistingPortfolio", "Portfolios updated: " + _db.Update(PORTFOLIO_TABLE_NAME, GetPortfolioContentValues(portfolio), "id = " + portfolioID, null));
+            Log.Error("UpdateExistingPortfolio", "Portfolios updated: " + Db.Update(PORTFOLIO_TABLE_NAME, GetPortfolioContentValues(portfolio), "id = " + portfolioID, null));
         }
 
         private void InsertNewPortfolio(Portfolio portfolio)
         {
-            Log.E("InsertNewPortfolio", "Portfolios inserted: " + _db.Insert(PORTFOLIO_TABLE_NAME, null, GetPortfolioContentValues(portfolio)));
+            Log.Error("InsertNewPortfolio", "Portfolios inserted: " + Db.Insert(PORTFOLIO_TABLE_NAME, null, GetPortfolioContentValues(portfolio)));
         }
 
         private void UpdateExistingPosition(Position position)
         {
             var positionID = position.ID ?? -1;
-            Log.E("UpdateExistingPosition", "Positions updated: " + _db.Update(POSITION_TABLE_NAME, GetPositionContentValues(position), "id = " + positionID, null));
+            Log.Error("UpdateExistingPosition", "Positions updated: " + Db.Update(POSITION_TABLE_NAME, GetPositionContentValues(position), "id = " + positionID, null));
         }
 
         private void InsertNewPosition(Position position)
         {
-            Log.E("InsertNewPosition", "Positions inserted: " + _db.Insert(POSITION_TABLE_NAME, null, GetPositionContentValues(position)));
+            Log.Error("InsertNewPosition", "Positions inserted: " + Db.Insert(POSITION_TABLE_NAME, null, GetPositionContentValues(position)));
         }
 
         private static ContentValues GetPortfolioContentValues(Portfolio portfolio)
@@ -192,41 +183,5 @@ namespace MonoStockPortfolio.Core.PortfolioRepositories
             positionValues.Put("ContainingPortfolioID", position.ContainingPortfolioID);
             return positionValues;
         }
-
-
-
-
-
-
-
-
-        private class OpenHelper : SQLiteOpenHelper
-        {
-            public OpenHelper(Context context, string name, SQLiteDatabase.ICursorFactory factory, int version)
-                : base(context, name, factory, version)
-            {
-            }
-
-            public override void OnCreate(SQLiteDatabase db)
-            {
-                db.ExecSQL("CREATE TABLE " + PORTFOLIO_TABLE_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, Name TEXT)");
-                db.ExecSQL("CREATE TABLE " + POSITION_TABLE_NAME + " (id INTEGER PRIMARY KEY AUTOINCREMENT, Ticker TEXT, Shares REAL, PricePerShare REAL, ContainingPortfolioID INT)");
-
-                db.ExecSQL("INSERT INTO " + PORTFOLIO_TABLE_NAME + " (Name) VALUES ('Sample portfolio')");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('GOOG', '500', '593.97', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('AMZN', '500', '180.00', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('AAPL', '500', '322.56', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('MSFT', '500', '27.91', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('NOVL', '500', '5.92', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('S', '500', '4.23', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('VZ', '500', '35.78', 1)");
-                db.ExecSQL("INSERT INTO " + POSITION_TABLE_NAME + " (Ticker, Shares, PricePerShare, ContainingPortfolioID) VALUES ('T', '500', '29.38', 1)");
-            }
-
-            public override void OnUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
-            {
-                Log.W("Upgrade", "Nothing to upgrade");
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/Services/PortfolioService.cs b/MonoStockPortfolio.Core/Services/PortfolioService.cs
index 2edd6ec..8780cfd 100644
--- a/MonoStockPortfolio.Core/Services/PortfolioService.cs
+++ b/MonoStockPortfolio.Core/Services/PortfolioService.cs
@@ -50,7 +50,7 @@ namespace MonoStockPortfolio.Core.Services
             }
             catch (Exception ex)
             {
-                Log.E("GetDetailedItems", ex.ToString());
+                Log.Error("GetDetailedItems", ex.ToString());
                 throw;
             }
         }
diff --git a/MonoStockPortfolio.Core/StockData/CsvParser.cs b/MonoStockPortfolio.Core/StockData/CsvParser.cs
new file mode 100644
index 0000000..1353f30
--- /dev/null
+++ b/MonoStockPortfolio.Core/StockData/CsvParser.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Android.Util;
+
+namespace MonoStockPortfolio.Core.StockData
+{
+    public class CsvParser
+    {
+        public static IEnumerable<string[]> ParseCsvIntoStockQuotes(string csvText)
+        {
+            using (var sr = new StringReader(csvText))
+            {
+                var lines = new List<string[]>();
+
+                try
+                {
+                    string line;
+                    while ((line = sr.ReadLine()) != null)
+                    {
+                        var tokens = line.Split(',');
+                        for (int i = 0; i < tokens.Length; i++)
+                        {
+                            tokens[i] = tokens[i].Trim('\"');
+                        }
+                        lines.Add(tokens);
+                    }
+                }
+                catch (Exception)
+                {
+                    Log.Error("ParseCSV", "Error in retrieving/parsing stock information");
+                }
+
+                return lines;
+            }
+        }        
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/StockData/GoogleStockDataProvider.cs b/MonoStockPortfolio.Core/StockData/GoogleStockDataProvider.cs
new file mode 100644
index 0000000..630aab6
--- /dev/null
+++ b/MonoStockPortfolio.Core/StockData/GoogleStockDataProvider.cs
@@ -0,0 +1,106 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using MonoStockPortfolio.Entities;
+
+namespace MonoStockPortfolio.Core.StockData
+{
+    public class GoogleStockDataProvider : IStockDataProvider
+    {
+        private const string BASE_URL = "http://www.google.com/finance/info?infotype=infoquoteall&q=";
+        /*
+        http://code.google.com/p/qsb-mac-plugins/source/browse/trunk/stock-quoter/trunk/StockQuoter.py?r=4
+         The Google Finance feed can return some or all of the following keys:
+
+  avvo    * Average volume (float with multiplier, like '3.54M')
+  beta    * Beta (float)
+  c       * Amount of change while open (float)
+  ccol    * (unknown) (chars)
+  cl        Last perc. change
+  cp      * Change perc. while open (float)
+  e       * Exchange (text, like 'NASDAQ')
+  ec      * After hours last change from close (float)
+  eccol   * (unknown) (chars)
+  ecp     * After hours last chage perc. from close (float)
+  el      * After. hours last quote (float)
+  el_cur  * (unknown) (float)
+  elt       After hours last quote time (unknown)
+  eo      * Exchange Open (0 or 1)
+  eps     * Earnings per share (float)
+  fwpe      Forward PE ratio (float)
+  hi      * Price high (float)
+  hi52    * 52 weeks high (float)
+  id      * Company id (identifying number)
+  l       * Last value while open (float)
+  l_cur   * Last value at close (like 'l')
+  lo      * Price low (float)
+  lo52    * 52 weeks low (float)
+  lt        Last value date/time
+  ltt       Last trade time (Same as "lt" without the data)
+  mc      * Market cap. (float with multiplier, like '123.45B')
+  name    * Company name (text)
+  op      * Open price (float)
+  pe      * PE ratio (float)
+  t       * Ticker (text)
+  type    * Type (i.e. 'Company')
+  vo      * Volume (float with multiplier, like '3.54M')
+         */
+
+        public IEnumerable<StockQuote> GetStockQuotes(IEnumerable<string> tickers)
+        {
+            var tickerCsv = string.Join(",", tickers.ToArray());
+            var url = BASE_URL + tickerCsv;
+            var jsonResults = ScrapeUrl(url).Split('}');
+
+            return jsonResults.Select(MapJsonToStockitems);
+        }
+
+        protected StockQuote MapJsonToStockitems(string jsonResults)
+        {
+            using(var sr = new StringReader(jsonResults))
+            {
+                var sq = new StockQuote();
+                string line;
+                while((line = sr.ReadLine()) != null)
+                {
+                    if(line.StartsWith(",\"t\""))
+                    {
+                        sq.Ticker = line.Replace(",\"t\" : ", "").Trim().Trim('"');
+                        continue;
+                    }
+                    if(line.StartsWith(",\"c\""))
+                    {
+                        sq.Change = decimal.Parse(line.Replace(",\"c\" : ", "").Trim().Trim('"'));
+                        continue;
+                    }
+                    if(line.StartsWith(",\"l\""))
+                    {
+                        sq.LastTradePrice = decimal.Parse(line.Replace(",\"l\" : ", "").Trim().Trim('"'));
+                        continue;
+                    }
+                    if(line.StartsWith(",\"ltt\""))
+                    {
+                        sq.LastTradeTime = line.Replace(",\"ltt\":", "").Trim().Trim('"').Replace("EST","").Trim();
+                        continue;
+                    }
+                }
+                return sq;
+            }
+        }
+
+        private static string ScrapeUrl(string url)
+        {
+            string resultCsv;
+            var req = WebRequest.Create(url);
+            var resp = req.GetResponse();
+            using (var sr = new StreamReader(resp.GetResponseStream()))
+            {
+                resultCsv = sr.ReadToEnd();
+                sr.Close();
+            }
+            return resultCsv;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/StockData/YahooFinanceStockData.cs b/MonoStockPortfolio.Core/StockData/YahooFinanceStockData.cs
deleted file mode 100644
index 16462d4..0000000
--- a/MonoStockPortfolio.Core/StockData/YahooFinanceStockData.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using FileHelpers;
-
-namespace MonoStockPortfolio.Core.StockData
-{
-    [DelimitedRecord(",")]
-    public class YahooFinanceStockData
-    {
-        [FieldQuoted(QuoteMode.OptionalForBoth)] 
-        public string Ticker;
-        
-        public decimal LastTradePrice;
-        
-        [FieldQuoted(QuoteMode.OptionalForBoth)]
-        public string Name;
-        
-        public string Volume;
-
-        public decimal Change;
-
-        [FieldQuoted(QuoteMode.OptionalForBoth)]
-        public string LastTradeTime;
-
-        [FieldQuoted(QuoteMode.OptionalForBoth)]
-        public string RealTimeLastTradeWithTime;
-
-        [FieldQuoted(QuoteMode.OptionalForBoth)]
-        public string ChangeRealTime;
-    }
-}
\ No newline at end of file
diff --git a/MonoStockPortfolio.Core/StockData/YahooStockDataProvider.cs b/MonoStockPortfolio.Core/StockData/YahooStockDataProvider.cs
deleted file mode 100644
index 871c317..0000000
--- a/MonoStockPortfolio.Core/StockData/YahooStockDataProvider.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using Android.Util;
-using FileHelpers;
-using MonoStockPortfolio.Entities;
-
-namespace MonoStockPortfolio.Core.StockData
-{
-    public class YahooStockDataProvider : IStockDataProvider
-    {
-        private const string LAST_TRADE_PRICE_ONLY = "l1";
-        private const string NAME = "n";
-        private const string VOLUME = "v";
-        private const string TICKER_SYMBOL = "s";
-        private const string CHANGE = "c1";
-        private const string LAST_TRADE_TIME = "t1";
-        private const string REAL_TIME_LAST_TRADE_WITH_TIME = "k1";
-        private const string REAL_TIME_CHANGE = "c6";
-
-        // http://www.gummy-stuff.org/Yahoo-data.htm
-        // http://finance.yahoo.com/d/quotes.csv?s= a BUNCH of 
-        // STOCK SYMBOLS separated by "+" &f=a bunch of special tags
-        public IEnumerable<StockQuote> GetStockQuotes(IEnumerable<string> tickers)
-        {
-            string url = "http://finance.yahoo.com/d/quotes.csv?s=";
-            url += string.Join("+", tickers.ToArray());
-            url += "&f=";
-            url += TICKER_SYMBOL;
-            url += LAST_TRADE_PRICE_ONLY;
-            url += NAME;
-            url += VOLUME;
-            url += CHANGE;
-            url += LAST_TRADE_TIME;
-            url += REAL_TIME_LAST_TRADE_WITH_TIME;
-            url += REAL_TIME_CHANGE;
-
-            string resultCsv = ScrapeUrl(url);
-
-            var yahooQuoteData = ParseCsvIntoStockQuotes(resultCsv);
-
-            foreach (var quote in yahooQuoteData)
-            {
-                yield return MapYahooData(quote);
-            }
-        }
-
-        private static StockQuote MapYahooData(YahooFinanceStockData data)
-        {
-            if(data == null)
-            {
-                return null;
-            }
-            var stock = new StockQuote();
-            stock.Name = data.Name;
-            stock.LastTradePrice = data.LastTradePrice;
-            stock.Ticker = data.Ticker;
-            stock.Volume = data.Volume;
-            stock.Change = data.Change;
-            stock.LastTradeTime = data.LastTradeTime;
-            stock.RealTimeLastTradePrice = decimal.Parse(data.RealTimeLastTradeWithTime
-                .Replace("<b>", "")
-                .Replace("</b>", "")
-                .Replace("N/A -", "")
-                .Trim()
-            );
-            stock.ChangeRealTime = data.ChangeRealTime;
-            return stock;
-        }
-
-        private static IList<YahooFinanceStockData> ParseCsvIntoStockQuotes(string csv)
-        {
-            var engine = new FileHelperEngine(typeof(YahooFinanceStockData));
-            var stockQuotes = engine.ReadString(csv) as YahooFinanceStockData[];
-            if(stockQuotes == null)
-            {
-                throw new ArgumentException("Could not parse CSV input");
-            }
-            return stockQuotes;
-        }
-
-        private static string ScrapeUrl(string url)
-        {
-            try
-            {
-                string resultCsv;
-                var req = WebRequest.Create(url);
-                var resp = req.GetResponse();
-                using (var sr = new StreamReader(resp.GetResponseStream()))
-                {
-                    resultCsv = sr.ReadToEnd();
-                    sr.Close();
-                }
-                return resultCsv;
-            }
-            catch (Exception ex)
-            {
-                Log.E("ScrapeUrlException", ex.ToString());
-                throw;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/MonoStockPortfolio.Entities/MonoStockPortfolio.Entities.csproj b/MonoStockPortfolio.Entities/MonoStockPortfolio.Entities.csproj
index a64137f..a5c0882 100644
--- a/MonoStockPortfolio.Entities/MonoStockPortfolio.Entities.csproj
+++ b/MonoStockPortfolio.Entities/MonoStockPortfolio.Entities.csproj
@@ -31,7 +31,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
diff --git a/MonoStockPortfolio.Entities/StockDataItem.cs b/MonoStockPortfolio.Entities/StockDataItem.cs
index 929dd94..f1020d5 100644
--- a/MonoStockPortfolio.Entities/StockDataItem.cs
+++ b/MonoStockPortfolio.Entities/StockDataItem.cs
@@ -3,22 +3,22 @@ namespace MonoStockPortfolio.Entities
     public enum StockDataItem
     {
         [StringValue("Change")]
-        Change,
+        Change = 0,
         [StringValue("Gain/Loss")]
-        GainLoss,
+        GainLoss = 1,
         [StringValue("Ticker")]
-        Ticker,
+        Ticker = 2,
         [StringValue("Time")]
-        Time,
+        Time = 3,
         [StringValue("Volume")]
-        Volume,
+        Volume = 4,
         [StringValue("Price")]
-        LastTradePrice,
+        LastTradePrice = 5,
         [StringValue("Price-RT")]
-        RealTimeLastTradeWithTime,
+        RealTimeLastTradeWithTime = 6,
         [StringValue("Change-RT")]
-        ChangeRealTime,
+        ChangeRealTime = 7,
         [StringValue("Gain/Loss-RT")]
-        GainLossRealTime
+        GainLossRealTime = 8
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio.Tests/CsvParserTests.cs b/MonoStockPortfolio.Tests/CsvParserTests.cs
new file mode 100644
index 0000000..275a844
--- /dev/null
+++ b/MonoStockPortfolio.Tests/CsvParserTests.cs
@@ -0,0 +1,47 @@
+using System.Linq;
+using MonoStockPortfolio.Core.StockData;
+using Xunit;
+
+namespace MonoStockPortfolio.Tests
+{
+    public class CsvParserTests
+    {
+        [Fact]
+        public void Can_parse_a_single_line_with_a_single_token()
+        {
+            var line = "XIN";
+            var result = CsvParser.ParseCsvIntoStockQuotes(line);
+
+            Assert.Equal(result.Count(), 1);
+            Assert.Equal(result.First()[0], "XIN");
+        }
+
+        [Fact]
+        public void Can_parse_two_lines_with_a_single_token_each()
+        {
+            var line = "XIN\nMSFT";
+            var result = CsvParser.ParseCsvIntoStockQuotes(line);
+
+            Assert.Equal(result.Count(), 2);
+            Assert.Equal(result.First()[0], "XIN");
+            Assert.Equal(result.ElementAt(1)[0], "MSFT");
+        }
+
+        [Fact]
+        public void Can_parse_a_more_complex_set()
+        {
+            var line = @"""XIN"",2.41,""Xinyuan Real Esta"",269244,-0.03,""4:00pm"",""N/A - <b>2.41</b>"",""-0.03""";
+            var result = CsvParser.ParseCsvIntoStockQuotes(line);
+
+            Assert.Equal(result.Count(), 1);
+            Assert.Equal(result.First()[0], "XIN");
+            Assert.Equal(result.First()[1], "2.41");
+            Assert.Equal(result.First()[2], "Xinyuan Real Esta");
+            Assert.Equal(result.First()[3], "269244");
+            Assert.Equal(result.First()[4], "-0.03");
+            Assert.Equal(result.First()[5], "4:00pm");
+            Assert.Equal(result.First()[6], "N/A - <b>2.41</b>");
+            Assert.Equal(result.First()[7], "-0.03");
+        }
+    }
+}
diff --git a/MonoStockPortfolio.Tests/GoogleStockQuoteTests.cs b/MonoStockPortfolio.Tests/GoogleStockQuoteTests.cs
new file mode 100644
index 0000000..36e35f5
--- /dev/null
+++ b/MonoStockPortfolio.Tests/GoogleStockQuoteTests.cs
@@ -0,0 +1,170 @@
+using MonoStockPortfolio.Core.StockData;
+using Xunit;
+
+namespace MonoStockPortfolio.Tests
+{
+    public class GoogleStockQuoteTests : GoogleStockDataProvider
+    {
+        #region ExampleJson : Example Json Result
+        private string ExampleJson =
+            @"
+// [ {
+""id"": ""720780""
+,""t"" : ""XIN""
+,""e"" : ""NYSE""
+,""l"" : ""2.41""
+,""l_cur"" : ""2.41""
+,""s"": ""0""
+,""ltt"":""4:00PM EST""
+,""lt"" : ""Feb 4, 4:00PM EST""
+,""c"" : ""-0.03""
+,""cp"" : ""-1.23""
+,""ccol"" : ""chr""
+,""eo"" : """"
+,""delay"": """"
+,""op"" : ""2.45""
+,""hi"" : ""2.45""
+,""lo"" : ""2.39""
+,""vo"" : ""269,244.00""
+,""avvo"" : ""352,270.00""
+,""hi52"" : ""4.30""
+,""lo52"" : ""2.20""
+,""mc"" : ""182.78M""
+,""pe"" : ""3.47""
+,""fwpe"" : """"
+,""beta"" : ""1.30""
+,""eps"" : ""0.69""
+,""name"" : ""Xinyuan Real Estate Co., Ltd. (ADR)""
+,""type"" : ""Company""
+}
+,{
+""id"": ""358464""
+,""t"" : ""MSFT""
+,""e"" : ""NASDAQ""
+,""l"" : ""27.77""
+,""l_cur"" : ""27.77""
+,""s"": ""2""
+,""ltt"":""4:01PM EST""
+,""lt"" : ""Feb 4, 4:01PM EST""
+,""c"" : ""+0.12""
+,""cp"" : ""0.43""
+,""ccol"" : ""chg""
+,""el"": ""27.72""
+,""el_cur"": ""27.72""
+,""elt"" : ""Feb 4, 7:39PM EST""
+,""ec"" : ""-0.05""
+,""ecp"" : ""-0.18""
+,""eccol"" : ""chr""
+,""div"" : ""0.16""
+,""yld"" : ""2.30""
+,""eo"" : """"
+,""delay"": """"
+,""op"" : ""27.73""
+,""hi"" : ""27.84""
+,""lo"" : ""27.51""
+,""vo"" : ""40.42M""
+,""avvo"" : ""55.50M""
+,""hi52"" : ""31.58""
+,""lo52"" : ""22.73""
+,""mc"" : ""233.33B""
+,""pe"" : ""11.77""
+,""fwpe"" : """"
+,""beta"" : ""1.06""
+,""eps"" : ""2.36""
+,""name"" : ""Microsoft Corporation""
+,""type"" : ""Company""
+}
+,{
+""id"": ""22144""
+,""t"" : ""AAPL""
+,""e"" : ""NASDAQ""
+,""l"" : ""346.50""
+,""l_cur"" : ""346.50""
+,""s"": ""2""
+,""ltt"":""4:02PM EST""
+,""lt"" : ""Feb 4, 4:02PM EST""
+,""c"" : ""+3.06""
+,""cp"" : ""0.89""
+,""ccol"" : ""chg""
+,""el"": ""346.48""
+,""el_cur"": ""346.48""
+,""elt"" : ""Feb 4, 7:59PM EST""
+,""ec"" : ""-0.02""
+,""ecp"" : ""-0.01""
+,""eccol"" : ""chr""
+,""div"" : """"
+,""yld"" : """"
+,""eo"" : """"
+,""delay"": """"
+,""op"" : ""343.76""
+,""hi"" : ""346.70""
+,""lo"" : ""343.51""
+,""vo"" : ""11.49M""
+,""avvo"" : ""15.58M""
+,""hi52"" : ""348.60""
+,""lo52"" : ""190.85""
+,""mc"" : ""319.22B""
+,""pe"" : ""19.35""
+,""fwpe"" : """"
+,""beta"" : ""1.38""
+,""eps"" : ""17.91""
+,""name"" : ""Apple Inc.""
+,""type"" : ""Company""
+}
+]
+";
+        #endregion
+
+        private string[] SplitResults
+        {
+            get
+            {
+                return ExampleJson.Split('}');
+            }
+        }
+
+        [Fact]
+        public void Test_ticker()
+        {
+            var results = base.MapJsonToStockitems(SplitResults[0]);
+            Assert.Equal(results.Ticker,"XIN");
+            results = base.MapJsonToStockitems(SplitResults[1]);
+            Assert.Equal(results.Ticker,"MSFT");
+            results = base.MapJsonToStockitems(SplitResults[2]);
+            Assert.Equal(results.Ticker,"AAPL");
+        }
+
+        [Fact]
+        public void Test_change()
+        {
+            var results = base.MapJsonToStockitems(SplitResults[0]);
+            Assert.Equal(results.Change, -0.03M);
+            results = base.MapJsonToStockitems(SplitResults[1]);
+            Assert.Equal(results.Change, 0.12M);
+            results = base.MapJsonToStockitems(SplitResults[2]);
+            Assert.Equal(results.Change, 3.06M);
+        }
+
+        [Fact]
+        public void Test_last_price()
+        {
+            var results = base.MapJsonToStockitems(SplitResults[0]);
+            Assert.Equal(results.LastTradePrice, 2.41M);
+            results = base.MapJsonToStockitems(SplitResults[1]);
+            Assert.Equal(results.LastTradePrice, 27.77M);
+            results = base.MapJsonToStockitems(SplitResults[2]);
+            Assert.Equal(results.LastTradePrice, 346.50M);
+        }
+
+        [Fact]
+        public void Test_time()
+        {
+            var results = base.MapJsonToStockitems(SplitResults[0]);
+            Assert.Equal(results.LastTradeTime, "4:00PM");
+            results = base.MapJsonToStockitems(SplitResults[1]);
+            Assert.Equal(results.LastTradeTime, "4:01PM");
+            results = base.MapJsonToStockitems(SplitResults[2]);
+            Assert.Equal(results.LastTradeTime, "4:02PM");
+        }
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio.Tests/MonoStockPortfolio.Tests.csproj b/MonoStockPortfolio.Tests/MonoStockPortfolio.Tests.csproj
new file mode 100644
index 0000000..597edbc
--- /dev/null
+++ b/MonoStockPortfolio.Tests/MonoStockPortfolio.Tests.csproj
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C2797FAB-AFAB-49F6-9131-FC9BF03CAB9D}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MonoStockPortfolio.Tests</RootNamespace>
+    <AssemblyName>MonoStockPortfolio.Tests</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="mscorlib">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Core">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="xunit">
+      <HintPath>..\libs\xunit.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CsvParserTests.cs" />
+    <Compile Include="GoogleStockQuoteTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MonoStockPortfolio.Core\MonoStockPortfolio.Core.csproj">
+      <Project>{251E7BB4-CFE2-4DE4-9E2A-AAE1AF41C8CB}</Project>
+      <Name>MonoStockPortfolio.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoStockPortfolio.Entities\MonoStockPortfolio.Entities.csproj">
+      <Project>{05A57650-3B41-46FF-9EAD-9112B5EFBEED}</Project>
+      <Name>MonoStockPortfolio.Entities</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MonoStockPortfolio\MonoStockPortfolio.csproj">
+      <Project>{E23D8575-CE4E-4716-B9C7-70115D23ADBB}</Project>
+      <Name>MonoStockPortfolio</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="PostSharp.Custom.targets" />
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/MonoStockPortfolio.Tests/PostSharp.Custom.targets b/MonoStockPortfolio.Tests/PostSharp.Custom.targets
new file mode 100644
index 0000000..38368c7
--- /dev/null
+++ b/MonoStockPortfolio.Tests/PostSharp.Custom.targets
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <PostSharpAssemblyBindingPolicySet>Silverlight20</PostSharpAssemblyBindingPolicySet>
+    </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/MonoStockPortfolio.Tests/Properties/AssemblyInfo.cs b/MonoStockPortfolio.Tests/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..2c0dd27
--- /dev/null
+++ b/MonoStockPortfolio.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,29 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MonoStockPortfolio.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("MonoStockPortfolio.Tests")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/MonoStockPortfolio.sln b/MonoStockPortfolio.sln
index 8c834bf..10045dc 100644
--- a/MonoStockPortfolio.sln
+++ b/MonoStockPortfolio.sln
@@ -8,15 +8,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{643BA3D4-E
 		libs\FileHelpers.dll = libs\FileHelpers.dll
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{4EE7F6AD-B8A9-4402-800E-E4C8AE0FF8FB}"
-	ProjectSection(SolutionItems) = preProject
-		assets\UInotes.txt = assets\UInotes.txt
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoStockPortfolio.Core", "MonoStockPortfolio.Core\MonoStockPortfolio.Core.csproj", "{251E7BB4-CFE2-4DE4-9E2A-AAE1AF41C8CB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoStockPortfolio.Entities", "MonoStockPortfolio.Entities\MonoStockPortfolio.Entities.csproj", "{05A57650-3B41-46FF-9EAD-9112B5EFBEED}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoStockPortfolio.Tests", "MonoStockPortfolio.Tests\MonoStockPortfolio.Tests.csproj", "{C2797FAB-AFAB-49F6-9131-FC9BF03CAB9D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,6 +32,10 @@ Global
 		{05A57650-3B41-46FF-9EAD-9112B5EFBEED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05A57650-3B41-46FF-9EAD-9112B5EFBEED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05A57650-3B41-46FF-9EAD-9112B5EFBEED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C2797FAB-AFAB-49F6-9131-FC9BF03CAB9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C2797FAB-AFAB-49F6-9131-FC9BF03CAB9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C2797FAB-AFAB-49F6-9131-FC9BF03CAB9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C2797FAB-AFAB-49F6-9131-FC9BF03CAB9D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MonoStockPortfolio/Activites/ConfigActivity.cs b/MonoStockPortfolio/Activites/ConfigActivity.cs
new file mode 100644
index 0000000..e4b5f32
--- /dev/null
+++ b/MonoStockPortfolio/Activites/ConfigActivity.cs
@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Linq;
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Preferences;
+using MonoStockPortfolio.Core.Config;
+using MonoStockPortfolio.Entities;
+using MonoStockPortfolio.Framework;
+using MonoStockPortfolio.Core;
+
+namespace MonoStockPortfolio.Activites
+{
+    [Activity(Label = "Config")]
+    public class ConfigActivity : PreferenceActivity
+    {
+        [IoC] private IConfigRepository _repo;
+        private StockItemPreference[] _stockItemsConfig;
+
+        protected override void OnCreate(Bundle bundle)
+        {
+            base.OnCreate(bundle);
+
+            AddPreferencesFromResource(Resource.Layout.config);
+
+            _stockItemsConfig = StockItemPreference.BuildList(_repo.GetStockItems()).ToArray();
+
+            var customPref = FindPreference("customStockItems");
+            customPref.PreferenceClick += customPref_PreferenceClick;
+        }
+
+        bool customPref_PreferenceClick(Preference preference)
+        {
+            IEnumerable<char>[] stockItemsDisplay = _stockItemsConfig.OrderBy(i => i.StockDataItem).Select(i => i.StockDataItem.GetStringValue()).ToArray();
+            bool[] allitemschecked = _stockItemsConfig.OrderBy(i => i.StockDataItem).Select(i => i.IsChecked).ToArray();
+            
+            var dialog = new AlertDialog.Builder(this);
+            dialog.SetMultiChoiceItems(stockItemsDisplay, allitemschecked, clickCallback);
+            dialog.SetTitle("Select columns");
+            dialog.SetPositiveButton("Save", okCallback);
+            dialog.Create().Show();
+            return true;
+        }
+
+        private void okCallback(object sender, DialogClickEventArgs e)
+        {
+            var list = _stockItemsConfig.Where(i => i.IsChecked).Select(i => i.StockDataItem).ToList();
+            _repo.UpdateStockItems(list);
+        }
+
+        private void clickCallback(object sender, DialogMultiChoiceClickEventArgs e)
+        {
+            _stockItemsConfig[e.Which].IsChecked = e.IsChecked;
+        }
+
+        public static string ClassName { get { return "monostockportfolio.activites.ConfigActivity"; } }
+
+        private class StockItemPreference
+        {
+            public static IEnumerable<StockItemPreference> BuildList(IEnumerable<StockDataItem> checkedItems)
+            {
+                var allitems = StockDataItem.Change.GetValues<StockDataItem>();
+
+                return allitems.Select(item => new StockItemPreference {StockDataItem = item, IsChecked = checkedItems.Contains(item)});
+            }
+            public StockDataItem StockDataItem { get; private set; }
+            public bool IsChecked { get; set; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio/Activites/EditPortfolioActivity.cs b/MonoStockPortfolio/Activites/EditPortfolioActivity.cs
index 6afcf8a..cf9203c 100644
--- a/MonoStockPortfolio/Activites/EditPortfolioActivity.cs
+++ b/MonoStockPortfolio/Activites/EditPortfolioActivity.cs
@@ -16,7 +16,7 @@ namespace MonoStockPortfolio.Activites
         {
             base.OnCreate(bundle);
 
-            SetContentView(Resource.layout.addportfolio);
+            SetContentView(Resource.Layout.addportfolio);
 
             WireUpEvents();
 
diff --git a/MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs b/MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs
index 460f96a..bc6555d 100644
--- a/MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/EditPortfolioActivity.designer.cs
@@ -8,7 +8,7 @@ namespace MonoStockPortfolio.Activites
         public static string Extra_PortfolioID { get { return "monoStockPortfolio.EditPortfolioActivity.PortfolioID"; } }
         public long ThisPortfolioId { get { return Intent.GetLongExtra(Extra_PortfolioID, -1); } }
 
-        protected Button SaveButton { get { return FindViewById<Button>(Resource.id.btnSave); } }
-        protected EditText PortfolioName { get { return FindViewById<EditText>(Resource.id.portfolioName); } }
+        protected Button SaveButton { get { return FindViewById<Button>(Resource.Id.btnSave); } }
+        protected EditText PortfolioName { get { return FindViewById<EditText>(Resource.Id.portfolioName); } }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio/Activites/EditPositionActivity.cs b/MonoStockPortfolio/Activites/EditPositionActivity.cs
index 7323cd7..a8145e4 100644
--- a/MonoStockPortfolio/Activites/EditPositionActivity.cs
+++ b/MonoStockPortfolio/Activites/EditPositionActivity.cs
@@ -16,7 +16,7 @@ namespace MonoStockPortfolio.Activites
         {
             base.OnCreate(bundle);
 
-            SetContentView(Resource.layout.addposition);
+            SetContentView(Resource.Layout.addposition);
 
             var positionId = ThisPositionId;
             if (positionId != -1)
diff --git a/MonoStockPortfolio/Activites/EditPositionActivity.designer.cs b/MonoStockPortfolio/Activites/EditPositionActivity.designer.cs
index 3e5e367..3e6846d 100644
--- a/MonoStockPortfolio/Activites/EditPositionActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/EditPositionActivity.designer.cs
@@ -10,9 +10,9 @@ namespace MonoStockPortfolio.Activites
         public static string Extra_PositionID { get { return "monoStockPortfolio.EditPositionActivity.PositionID"; } }
         public long ThisPositionId { get { return Intent.GetLongExtra(Extra_PositionID, -1); } }
 
-        protected EditText TickerTextBox { get { return FindViewById<EditText>(Resource.id.addPositionTicker); } }
-        protected EditText PriceTextBox { get { return FindViewById<EditText>(Resource.id.addPositionPrice); } }
-        protected EditText SharesTextBox { get { return FindViewById<EditText>(Resource.id.addPositionShares); } }
-        protected Button SaveButton { get { return FindViewById<Button>(Resource.id.addPositionSaveButton); } }
+        protected EditText TickerTextBox { get { return FindViewById<EditText>(Resource.Id.addPositionTicker); } }
+        protected EditText PriceTextBox { get { return FindViewById<EditText>(Resource.Id.addPositionPrice); } }
+        protected EditText SharesTextBox { get { return FindViewById<EditText>(Resource.Id.addPositionShares); } }
+        protected Button SaveButton { get { return FindViewById<Button>(Resource.Id.addPositionSaveButton); } }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio/Activites/MainActivity.cs b/MonoStockPortfolio/Activites/MainActivity.cs
index 5f05a49..f803f07 100644
--- a/MonoStockPortfolio/Activites/MainActivity.cs
+++ b/MonoStockPortfolio/Activites/MainActivity.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Android.App;
 using Android.Content;
 using Android.OS;
+using Android.Views;
 using Android.Widget;
 using MonoStockPortfolio.Core.PortfolioRepositories;
 using MonoStockPortfolio.Entities;
@@ -22,7 +23,7 @@ namespace MonoStockPortfolio.Activites
         {
             base.OnCreate(bundle);
 
-            SetContentView(Resource.layout.main);
+            SetContentView(Resource.Layout.main);
 
             RefreshList();
 
@@ -33,7 +34,7 @@ namespace MonoStockPortfolio.Activites
         {
             _portfolios = _repo.GetAllPortfolios();
 
-            var listAdapter = new ArrayAdapter<string>(this, Android.R.Layout.SimpleListItem1, _portfolios.Select(p => p.Name).ToList());
+            var listAdapter = new ArrayAdapter<string>(this, Android.Resource.Layout.SimpleListItem1, _portfolios.Select(p => p.Name).ToList());
             PortfolioListView.Adapter = listAdapter;
         }
 
@@ -79,6 +80,32 @@ namespace MonoStockPortfolio.Activites
             return base.OnContextItemSelected(item);
         }
 
+        public override bool OnCreateOptionsMenu(IMenu menu)
+        {
+            var configItem = menu.Add(0, 1, 1, "Config");
+            configItem.SetIcon(Android.Resource.Drawable.IcMenuPreferences);
+            var exitItem = menu.Add(0, 1, 1, "Exit");
+            exitItem.SetIcon(Android.Resource.Drawable.IcMenuCloseClearCancel);
+            return true;
+        }
+
+        public override bool OnOptionsItemSelected(IMenuItem item)
+        {
+            switch (item.Title.ToS())
+            {
+                case "Config":
+                    var intent = new Intent();
+                    intent.SetClassName(this, ConfigActivity.ClassName);
+                    StartActivityForResult(intent, 0);
+                    return true;
+                case "Exit":
+                    Finish();
+                    return true;
+                default:
+                    return base.OnOptionsItemSelected(item);
+            }
+        }
+
         private void listView_ItemClick(object sender, ItemEventArgs e)
         {
             var intent = new Intent();
diff --git a/MonoStockPortfolio/Activites/MainActivity.designer.cs b/MonoStockPortfolio/Activites/MainActivity.designer.cs
index 6da565b..82f8f3c 100644
--- a/MonoStockPortfolio/Activites/MainActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/MainActivity.designer.cs
@@ -6,7 +6,7 @@ namespace MonoStockPortfolio.Activites
     {
         public static string ClassName { get { return "monostockportfolio.activites.MainActivity"; } }
 
-        protected Button AddPortfolioButton { get { return FindViewById<Button>(Resource.id.btnAddPortfolio); } }
-        protected ListView PortfolioListView { get { return FindViewById<ListView>(Resource.id.portfolioList); } }
+        protected Button AddPortfolioButton { get { return FindViewById<Button>(Resource.Id.btnAddPortfolio); } }
+        protected ListView PortfolioListView { get { return FindViewById<ListView>(Resource.Id.portfolioList); } }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio/Activites/PortfolioActivity.cs b/MonoStockPortfolio/Activites/PortfolioActivity.cs
index ffe3bd9..d8fa02f 100644
--- a/MonoStockPortfolio/Activites/PortfolioActivity.cs
+++ b/MonoStockPortfolio/Activites/PortfolioActivity.cs
@@ -27,7 +27,7 @@ namespace MonoStockPortfolio.Activites
         {
             base.OnCreate(bundle);
 
-            SetContentView(Resource.layout.portfolio);
+            SetContentView(Resource.Layout.portfolio);
 
             Refresh();
 
@@ -39,7 +39,7 @@ namespace MonoStockPortfolio.Activites
         public override bool OnCreateOptionsMenu(IMenu menu)
         {
             var item = menu.Add(0,1,1,"Refresh");
-            item.SetIcon(Resource.drawable.ic_menu_refresh);
+            item.SetIcon(Resource.Drawable.ic_menu_refresh);
             return true;
         }
 
@@ -115,7 +115,7 @@ namespace MonoStockPortfolio.Activites
 
         private void ShowMessage(string message)
         {
-            var listAdapter = new ArrayAdapter<string>(this, Android.R.Layout.SimpleListItem1, new[] {message});
+            var listAdapter = new ArrayAdapter<string>(this, Android.Resource.Layout.SimpleListItem1, new[] { message });
             QuoteListview.Adapter = listAdapter;
         }
 
@@ -134,10 +134,10 @@ namespace MonoStockPortfolio.Activites
                 var textItem = new TextView(this);
                 textItem.Text = stockDataItem.GetStringValue();
                 textItem.SetWidth(cellwidth);
-                textItem.SetTextColor(Resources.GetColor(Android.R.Color.Black));
+                textItem.SetTextColor(Resources.GetColor(Android.Resource.Color.Black));
                 QuoteListviewHeader.AddView(textItem);
             }
-            QuoteListviewHeader.SetBackgroundResource(Android.R.Color.BackgroundLight);
+            QuoteListviewHeader.SetBackgroundResource(Android.Resource.Color.BackgroundLight);
         }
 
         public class PositionArrayAdapter : GenericArrayAdapter<PositionResultsViewModel>
diff --git a/MonoStockPortfolio/Activites/PortfolioActivity.designer.cs b/MonoStockPortfolio/Activites/PortfolioActivity.designer.cs
index fe07302..c3454d0 100644
--- a/MonoStockPortfolio/Activites/PortfolioActivity.designer.cs
+++ b/MonoStockPortfolio/Activites/PortfolioActivity.designer.cs
@@ -9,8 +9,8 @@ namespace MonoStockPortfolio.Activites
         public static string Extra_PortfolioID { get { return "monoStockPortfolio.PortfolioActivity.PortfolioID"; } }
         public long ThisPortofolioId { get { return Intent.GetLongExtra(Extra_PortfolioID, -1); } }
 
-        protected ListView QuoteListview { get { return FindViewById<ListView>(Resource.id.quoteListview); } }
-        protected Button AddPositionButton { get { return FindViewById<Button>(Resource.id.btnAddPosition); } }
-        protected LinearLayout QuoteListviewHeader { get { return FindViewById<LinearLayout>(Resource.id.quoteHeaderLayout); } }
+        protected ListView QuoteListview { get { return FindViewById<ListView>(Resource.Id.quoteListview); } }
+        protected Button AddPositionButton { get { return FindViewById<Button>(Resource.Id.btnAddPosition); } }
+        protected LinearLayout QuoteListviewHeader { get { return FindViewById<LinearLayout>(Resource.Id.quoteHeaderLayout); } }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio/Framework/IoCAttribute.cs b/MonoStockPortfolio/Framework/IoCAttribute.cs
index fa20ee4..f021a1e 100644
--- a/MonoStockPortfolio/Framework/IoCAttribute.cs
+++ b/MonoStockPortfolio/Framework/IoCAttribute.cs
@@ -5,18 +5,18 @@ namespace MonoStockPortfolio.Framework
 {
     public class IoCAttribute : LocationInterceptionAspect
     {
-        public override void OnGetValue(LocationInterceptionArgs args)
+        public sealed override void OnGetValue(LocationInterceptionArgs args)
         {
             if (ServiceLocator.Context == null)
             {
-                var activityContext= (Context)args.Instance;
+                var activityContext = (Context)args.Instance;
                 ServiceLocator.Context = activityContext.ApplicationContext.ApplicationContext;
             }
 
             var locationType = args.Location.LocationType;
             var instantiation = ServiceLocator.Get(locationType);
 
-            if(instantiation != null)
+            if (instantiation != null)
             {
                 args.SetNewValue(instantiation);
             }
diff --git a/MonoStockPortfolio/Framework/IttyBittyIoC.cs b/MonoStockPortfolio/Framework/IttyBittyIoC.cs
new file mode 100644
index 0000000..6b2fb6a
--- /dev/null
+++ b/MonoStockPortfolio/Framework/IttyBittyIoC.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace MonoStockPortfolio.Framework
+{
+    public static class IttyBittyIoC
+    {
+        [AttributeUsage(AttributeTargets.Constructor)]
+        public class InjectionConstructorAttribute : Attribute
+        { }
+
+        private enum DependencyType
+        {
+            None = 0,   // Type is unset
+            Delegate,   // A builder function
+            Instance,   // A specific instance
+            Singleton,  // Dynamically created singleton
+            Transient   // Dynamically created transient object
+        }
+
+        private class DependencyInfo
+        {
+            public object Dependency { get; private set; }
+            public DependencyType DependencyType { get; private set; }
+
+            public DependencyInfo(DependencyType dependencyType, object dependency)
+            {
+                DependencyType = dependencyType;
+                Dependency = dependency;
+            }
+        }
+
+        private readonly static IDictionary<Type, DependencyInfo> dependencies = new Dictionary<Type, DependencyInfo>();
+        private readonly static IDictionary<Type, object> instances = new Dictionary<Type, object>();
+
+        public static void Register<TContract>(TContract instance)
+        {
+            dependencies[typeof(TContract)] = new DependencyInfo(DependencyType.Instance, instance);
+            instances[typeof(TContract)] = instance;
+        }
+
+        public static void Register<TContract, TImplementation>()
+        {
+            Register<TContract, TImplementation>(false);
+        }
+
+        public static void Register<TContract, TImplementation>(bool isSingleton)
+        {
+            DependencyType dependencyType = isSingleton ? DependencyType.Singleton : DependencyType.Transient;
+            dependencies[typeof(TContract)] = new DependencyInfo(dependencyType, typeof(TImplementation));
+        }
+
+        public static void Register<TContract>(Func<TContract> builder)
+        {
+            dependencies[typeof(TContract)] = new DependencyInfo(DependencyType.Delegate, builder);
+        }
+
+        public static TContract Resolve<TContract>()
+        {
+            return (TContract)Resolve(typeof(TContract));
+        }
+
+        public static object Resolve(Type contract)
+        {
+            if (!dependencies.ContainsKey(contract))
+                throw new InvalidOperationException(string.Format("Unable to resolve type '{0}'.", contract));
+            if (instances.ContainsKey(contract))
+                return instances[contract];
+            var dependency = dependencies[contract];
+            if (dependency.DependencyType == DependencyType.Delegate)
+                return ((Delegate)dependency.Dependency).DynamicInvoke();
+
+            var constructorInfo = ((Type)dependency.Dependency).GetConstructors()
+                .OrderByDescending(o => (o.GetCustomAttributes(typeof(InjectionConstructorAttribute), false).Count()))
+                .ThenByDescending(o => (o.GetParameters().Length))
+                .First();
+            var parameterInfos = constructorInfo.GetParameters();
+
+            object instance;
+            if (parameterInfos.Length == 0)
+            {
+                instance = Activator.CreateInstance((Type)dependency.Dependency);
+            }
+            else
+            {
+                var parameters = new List<object>(parameterInfos.Length);
+                foreach (ParameterInfo parameterInfo in parameterInfos)
+                {
+                    parameters.Add(Resolve(parameterInfo.ParameterType));
+                }
+                instance = constructorInfo.Invoke(parameters.ToArray());
+            }
+
+            if (dependency.DependencyType == DependencyType.Singleton)
+            {
+                instances[contract] = instance;
+            }
+
+            return instance;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MonoStockPortfolio/Framework/ServiceLocator.cs b/MonoStockPortfolio/Framework/ServiceLocator.cs
index dd67df3..7c0b45a 100644
--- a/MonoStockPortfolio/Framework/ServiceLocator.cs
+++ b/MonoStockPortfolio/Framework/ServiceLocator.cs
@@ -4,35 +4,25 @@ using MonoStockPortfolio.Core.Config;
 using MonoStockPortfolio.Core.PortfolioRepositories;
 using MonoStockPortfolio.Core.Services;
 using MonoStockPortfolio.Core.StockData;
-using TinyIoC;
 
 namespace MonoStockPortfolio.Framework
 {
     public static class ServiceLocator
     {
         public static Context Context { get; set; }
-        private static TinyIoCContainer _container;
+
+        static ServiceLocator()
+        {
+            //IttyBittyIoC.Register(Context);
+            IttyBittyIoC.Register<IStockDataProvider>(() => new GoogleStockDataProvider());
+            IttyBittyIoC.Register<IPortfolioService>(() => new PortfolioService(new AndroidSqlitePortfolioRepository(Context), new GoogleStockDataProvider()));
+            IttyBittyIoC.Register<IPortfolioRepository>(() => new AndroidSqlitePortfolioRepository(Context));
+            IttyBittyIoC.Register<IConfigRepository>(() => new AndroidSqliteConfigRepository(Context));
+        }
 
         public static object Get(Type serviceType)
         {
-            if (_container == null)
-            {
-                _container = RegisterTypes();
-            }
-            return _container.Resolve(serviceType);
-        }
-
-        private static TinyIoCContainer RegisterTypes()
-        {
-            var container = TinyIoCContainer.Current;
-
-            container.Register<Context>(Context);
-            container.Register<IStockDataProvider, YahooStockDataProvider>().AsMultiInstance();
-            container.Register<IPortfolioService, PortfolioService>().AsMultiInstance();
-            container.Register<IPortfolioRepository, AndroidSqlitePortfolioRepository>().AsMultiInstance();
-            container.Register<IConfigRepository, AndroidSqliteConfigRepository>().AsMultiInstance();
-
-            return container;
+            return IttyBittyIoC.Resolve(serviceType);
         }
     }
 }
\ No newline at end of file
diff --git a/MonoStockPortfolio/Framework/TinyIoC.cs b/MonoStockPortfolio/Framework/TinyIoC.cs
deleted file mode 100644
index 160d6e6..0000000
--- a/MonoStockPortfolio/Framework/TinyIoC.cs
+++ /dev/null
@@ -1,2887 +0,0 @@
-//===============================================================================
-// TinyIoC
-//
-// An easy to use, hassle free, Inversion of Control Container for small projects
-// and beginners alike.
-//
-// http://hg.grumpydev.com/tinyioc
-//===============================================================================
-// Copyright © Steven Robbins.  All rights reserved.
-// THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
-// OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT
-// LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-// FITNESS FOR A PARTICULAR PURPOSE.
-//===============================================================================
-
-#region Preprocessor Directives
-// Uncomment this line if you want the container to automatically
-// register the TinyMessenger messenger/event aggregator
-//#define TINYMESSENGER
-
-// Preprocessor directives for enabling/disabling functionality
-// depending on platform features. If the platform has an appropriate
-// #DEFINE then these should be set automatically below.
-#define EXPRESSIONS                         // Platform supports System.Linq.Expressions
-#define APPDOMAIN_GETASSEMBLIES             // Platform supports getting all assemblies from the AppDomain object
-#define UNBOUND_GENERICS_GETCONSTRUCTORS    // Platform supports GetConstructors on unbound generic types
-
-// CompactFramework
-// By default does not support System.Linq.Expressions.
-// AppDomain object does not support enumerating all assemblies in the app domain.
-#if PocketPC || WINDOWS_PHONE
-#undef EXPRESSIONS
-#undef APPDOMAIN_GETASSEMBLIES
-#undef UNBOUND_GENERICS_GETCONSTRUCTORS
-#endif
-
-#if SILVERLIGHT
-#undef APPDOMAIN_GETASSEMBLIES
-#endif
-#endregion
-namespace TinyIoC
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Reflection;
-#if EXPRESSIONS
-    using System.Linq.Expressions;
-#endif
-
-    #region SafeDictionary
-    public class SafeDictionary<TKey, TValue> : IDisposable
-    {
-        private readonly object _Padlock = new object();
-        private readonly Dictionary<TKey, TValue> _Dictionary = new Dictionary<TKey, TValue>();
-
-        public TValue this[TKey key]
-        {
-            set
-            {
-                lock (_Padlock)
-                {
-                    TValue current;
-                    if (_Dictionary.TryGetValue(key, out current))
-                    {
-                        var disposable = current as IDisposable;
-
-                        if (disposable != null)
-                            disposable.Dispose();
-                    }
-
-                    _Dictionary[key] = value;
-                }
-            }
-        }
-
-        public bool TryGetValue(TKey key, out TValue value)
-        {
-            lock (_Padlock)
-            {
-                return _Dictionary.TryGetValue(key, out value);
-            }
-        }
-
-        public bool Remove(TKey key)
-        {
-            lock (_Padlock)
-            {
-                return _Dictionary.Remove(key);
-            }
-        }
-
-        public void Clear()
-        {
-            lock (_Padlock)
-            {
-                _Dictionary.Clear();
-            }
-        }
-
-        public IEnumerable<TKey> Keys
-        {
-            get
-            {
-                return _Dictionary.Keys;
-            }
-        }
-        #region IDisposable Members
-
-        public void Dispose()
-        {
-            lock (_Padlock)
-            {
-                var disposableItems = from item in _Dictionary.Values
-                                      where item is IDisposable
-                                      select item as IDisposable;
-
-                foreach (var item in disposableItems)
-                {
-                    item.Dispose();
-                }
-            }
-
-            GC.SuppressFinalize(this);
-        }
-
-        #endregion
-    }
-    #endregion
-
-    #region Extensions
-    public static class TypeExtensions
-    {
-        /// <summary>
-        /// Gets a generic method from a type given the method name, binding flags, generic types and parameter types
-        /// </summary>
-        /// <param name="sourceType">Source type</param>
-        /// <param name="bindingFlags">Binding flags</param>
-        /// <param name="methodName">Name of the method</param>
-        /// <param name="genericTypes">Generic types to use to make the method generic</param>
-        /// <param name="parameterTypes">Method parameters</param>
-        /// <returns>MethodInfo or null if no matches found</returns>
-        /// <exception cref="System.Reflection.AmbiguousMatchException"/>
-        /// <exception cref="System.ArgumentException"/>
-        public static MethodInfo GetGenericMethod(this Type sourceType, System.Reflection.BindingFlags bindingFlags, string methodName, Type[] genericTypes, Type[] parameterTypes)
-        {
-            var methods = sourceType.GetMethods(bindingFlags)
-                .Where(mi => string.Equals(methodName, mi.Name, StringComparison.InvariantCulture))
-                .Where(mi => mi.ContainsGenericParameters)
-                .Where(mi => mi.GetGenericArguments().Length == genericTypes.Length)
-                .Where(mi => mi.GetParameters().Length == parameterTypes.Length)
-                .Select(mi => mi.MakeGenericMethod(genericTypes))
-                .Where(mi => mi.GetParameters().Select(pi => pi.ParameterType).SequenceEqual(parameterTypes))
-                .ToList();
-
-            if (methods.Count > 1)
-                throw new AmbiguousMatchException();
-
-            var method = methods.FirstOrDefault();
-
-            return method;
-        }
-    }
-    #endregion
-
-    #region TinyIoC Exception Types
-    public class TinyIoCResolutionException : Exception
-    {
-        private const string ERROR_TEXT = "Unable to resolve type: {0}";
-
-        public TinyIoCResolutionException(Type type)
-            : base(String.Format(ERROR_TEXT, type.FullName))
-        {
-        }
-
-        public TinyIoCResolutionException(Type type, Exception innerException)
-            : base(String.Format(ERROR_TEXT, type.FullName), innerException)
-        {
-        }
-    }
-
-    public class TinyIoCRegistrationTypeException : Exception
-    {
-        private const string REGISTER_ERROR_TEXT = "Cannot register type {0} - abstract classes or interfaces are not valid implementation types for {1}.";
-
-        public TinyIoCRegistrationTypeException(Type type, string factory)
-            : base(String.Format(REGISTER_ERROR_TEXT, type.FullName, factory))
-        {
-        }
-
-        public TinyIoCRegistrationTypeException(Type type, string factory, Exception innerException)
-            : base(String.Format(REGISTER_ERROR_TEXT, type.FullName, factory), innerException)
-        {
-        }
-    }
-
-    public class TinyIoCRegistrationException : Exception
-    {
-        private const string CONVERT_ERROR_TEXT = "Cannot convert current registration of {0} to {1}";
-        private const string GENERIC_CONSTRAINT_ERROR_TEXT = "Type {1} is not valid for a registration of type {0}";
-
-        public TinyIoCRegistrationException(Type type, string method)
-            : base(String.Format(CONVERT_ERROR_TEXT, type.FullName, method))
-        {
-        }
-
-        public TinyIoCRegistrationException(Type type, string method, Exception innerException)
-            : base(String.Format(CONVERT_ERROR_TEXT, type.FullName, method), innerException)
-        {
-        }
-
-        public TinyIoCRegistrationException(Type registerType, Type implementationType)
-            : base(String.Format(GENERIC_CONSTRAINT_ERROR_TEXT, registerType.FullName, implementationType.FullName))
-        {
-        }
-
-        public TinyIoCRegistrationException(Type registerType, Type implementationType, Exception innerException)
-            : base(String.Format(GENERIC_CONSTRAINT_ERROR_TEXT, registerType.FullName, implementationType.FullName), innerException)
-        {
-        }
-    }
-
-    public class TinyIoCWeakReferenceException : Exception
-    {
-        private const string ERROR_TEXT = "Unable to instantiate {0} - referenced object has been reclaimed";
-
-        public TinyIoCWeakReferenceException(Type type)
-            : base(String.Format(ERROR_TEXT, type.FullName))
-        {
-        }
-
-        public TinyIoCWeakReferenceException(Type type, Exception innerException)
-            : base(String.Format(ERROR_TEXT, type.FullName), innerException)
-        {
-        }
-    }
-
-    public class TinyIoCConstructorResolutionException : Exception
-    {
-        private const string ERROR_TEXT = "Unable to resolve constructor for {0} using provided Expression.";
-
-        public TinyIoCConstructorResolutionException(Type type)
-            : base(String.Format(ERROR_TEXT, type.FullName))
-        {
-        }
-
-        public TinyIoCConstructorResolutionException(Type type, Exception innerException)
-            : base(String.Format(ERROR_TEXT, type.FullName), innerException)
-        {
-        }
-
-        public TinyIoCConstructorResolutionException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        public TinyIoCConstructorResolutionException(string message)
-            : base(message)
-        {
-        }
-    }
-
-    public class TinyIoCAutoRegistrationException : Exception
-    {
-        private const string ERROR_TEXT = "Duplicate implementation of type {0} found ({1}).";
-
-        public TinyIoCAutoRegistrationException(Type registerType, IEnumerable<Type> types)
-            : base(String.Format(ERROR_TEXT, registerType, GetTypesString(types)))
-        {
-        }
-
-        public TinyIoCAutoRegistrationException(Type registerType, IEnumerable<Type> types, Exception innerException)
-            : base(String.Format(ERROR_TEXT, registerType, GetTypesString(types)), innerException)
-        {
-        }
-
-        private static string GetTypesString(IEnumerable<Type> types)
-        {
-            var typeNames = from type in types
-                            select type.FullName;
-
-            return string.Join(",", typeNames.ToArray());
-        }
-    }
-    #endregion
-
-    #region Public Setup / Settings Classes
-    /// <summary>
-    /// Name/Value pairs for specifying "user" parameters when resolving
-    /// </summary>
-    public sealed class NamedParameterOverloads : Dictionary<string, object>
-    {
-        public static NamedParameterOverloads FromIDictionary(IDictionary<string, object> data)
-        {
-            return data as NamedParameterOverloads ?? new NamedParameterOverloads(data);
-        }
-
-        public NamedParameterOverloads()
-        {
-        }
-
-        public NamedParameterOverloads(IDictionary<string, object> data)
-            : base(data)
-        {
-        }
-
-        private static readonly NamedParameterOverloads _Default = new NamedParameterOverloads();
-
-        public static NamedParameterOverloads Default
-        {
-            get
-            {
-                return _Default;
-            }
-        }
-    }
-
-    public enum UnregisteredResolutionActions
-    {
-        /// <summary>
-        /// Attempt to resolve type, even if the type isn't registered.
-        /// 
-        /// Registered types/options will always take precedence.
-        /// </summary>
-        AttemptResolve,
-
-        /// <summary>
-        /// Fail resolution if type not explicitly registered
-        /// </summary>
-        Fail,
-
-        /// <summary>
-        /// Attempt to resolve unregistered type if requested type is generic
-        /// and no registration exists for the specific generic parameters used.
-        /// 
-        /// Registered types/options will always take precedence.
-        /// </summary>
-        GenericsOnly
-    }
-
-    public enum NamedResolutionFailureActions
-    {
-        AttemptUnnamedResolution,
-        Fail
-    }
-
-    /// <summary>
-    /// Resolution settings
-    /// </summary>
-    public sealed class ResolveOptions
-    {
-        private static readonly ResolveOptions _Default = new ResolveOptions();
-        private static readonly ResolveOptions _FailUnregisteredAndNameNotFound = new ResolveOptions() { NamedResolutionFailureAction = NamedResolutionFailureActions.Fail, UnregisteredResolutionAction = UnregisteredResolutionActions.Fail };
-        private static readonly ResolveOptions _FailUnregisteredOnly = new ResolveOptions() { NamedResolutionFailureAction = NamedResolutionFailureActions.AttemptUnnamedResolution, UnregisteredResolutionAction = UnregisteredResolutionActions.Fail };
-        private static readonly ResolveOptions _FailNameNotFoundOnly = new ResolveOptions() { NamedResolutionFailureAction = NamedResolutionFailureActions.Fail, UnregisteredResolutionAction = UnregisteredResolutionActions.AttemptResolve };
-
-        private UnregisteredResolutionActions _UnregisteredResolutionAction = UnregisteredResolutionActions.AttemptResolve;
-        public UnregisteredResolutionActions UnregisteredResolutionAction
-        {
-            get { return _UnregisteredResolutionAction; }
-            set { _UnregisteredResolutionAction = value; }
-        }
-
-        private NamedResolutionFailureActions _NamedResolutionFailureAction = NamedResolutionFailureActions.Fail;
-        public NamedResolutionFailureActions NamedResolutionFailureAction
-        {
-            get { return _NamedResolutionFailureAction; }
-            set { _NamedResolutionFailureAction = value; }
-        }
-
-        /// <summary>
-        /// Gets the default options (attempt resolution of unregistered types, fail on named resolution if name not found)
-        /// </summary>
-        public static ResolveOptions Default
-        {
-            get
-            {
-                return _Default;
-            }
-        }
-
-        /// <summary>
-        /// Preconfigured option for attempting resolution of unregistered types and failing on named resolution if name not found
-        /// </summary>
-        public static ResolveOptions FailNameNotFoundOnly
-        {
-            get
-            {
-                return _FailNameNotFoundOnly;
-            }
-        }
-
-        /// <summary>
-        /// Preconfigured option for failing on resolving unregistered types and on named resolution if name not found
-        /// </summary>
-        public static ResolveOptions FailUnregisteredAndNameNotFound
-        {
-            get
-            {
-                return _FailUnregisteredAndNameNotFound;
-            }
-        }
-
-        /// <summary>
-        /// Preconfigured option for failing on resolving unregistered types, but attempting unnamed resolution if name not found
-        /// </summary>
-        public static ResolveOptions FailUnregisteredOnly
-        {
-            get
-            {
-                return _FailUnregisteredOnly;
-            }
-        }
-    }
-    #endregion
-
-    public sealed class TinyIoCContainer : IDisposable
-    {
-        #region "Fluent" API
-        /// <summary>
-        /// Registration options for "fluent" API
-        /// </summary>
-        public sealed class RegisterOptions
-        {
-            private TinyIoCContainer _Container;
-            private TypeRegistration _Registration;
-
-            public RegisterOptions(TinyIoCContainer container, TypeRegistration registration)
-            {
-                _Container = container;
-                _Registration = registration;
-            }
-
-            /// <summary>
-            /// Make registration a singleton (single instance) if possible
-            /// </summary>
-            /// <returns>RegisterOptions</returns>
-            /// <exception cref="TinyIoCInstantiationTypeException"></exception>
-            public RegisterOptions AsSingleton()
-            {
-                var currentFactory = _Container.GetCurrentFactory(_Registration);
-
-                if (currentFactory == null)
-                    throw new TinyIoCRegistrationException(_Registration.Type, "singleton");
-
-                return _Container.AddUpdateRegistration(_Registration, currentFactory.SingletonVariant);
-            }
-
-            /// <summary>
-            /// Make registration multi-instance if possible
-            /// </summary>
-            /// <returns>RegisterOptions</returns>
-            /// <exception cref="TinyIoCInstantiationTypeException"></exception>
-            public RegisterOptions AsMultiInstance()
-            {
-                var currentFactory = _Container.GetCurrentFactory(_Registration);
-
-                if (currentFactory == null)
-                    throw new TinyIoCRegistrationException(_Registration.Type, "multi-instance");
-
-                return _Container.AddUpdateRegistration(_Registration, currentFactory.MultiInstanceVariant);
-            }
-
-            /// <summary>
-            /// Make registration hold a weak reference if possible
-            /// </summary>
-            /// <returns>RegisterOptions</returns>
-            /// <exception cref="TinyIoCInstantiationTypeException"></exception>
-            public RegisterOptions WithWeakReference()
-            {
-                var currentFactory = _Container.GetCurrentFactory(_Registration);
-
-                if (currentFactory == null)
-                    throw new TinyIoCRegistrationException(_Registration.Type, "weak reference");
-
-                return _Container.AddUpdateRegistration(_Registration, currentFactory.WeakReferenceVariant);
-            }
-
-            /// <summary>
-            /// Make registration hold a strong reference if possible
-            /// </summary>
-            /// <returns>RegisterOptions</returns>
-            /// <exception cref="TinyIoCInstantiationTypeException"></exception>
-            public RegisterOptions WithStrongReference()
-            {
-                var currentFactory = _Container.GetCurrentFactory(_Registration);
-
-                if (currentFactory == null)
-                    throw new TinyIoCRegistrationException(_Registration.Type, "strong reference");
-
-                return _Container.AddUpdateRegistration(_Registration, currentFactory.StrongReferenceVariant);
-            }
-
-#if EXPRESSIONS
-            public RegisterOptions UsingConstructor<RegisterType>(Expression<Func<RegisterType>> constructor)
-            {
-                var lambda = constructor as LambdaExpression;
-                if (lambda == null)
-                    throw new TinyIoCConstructorResolutionException(typeof(RegisterType));
-
-                var newExpression = lambda.Body as NewExpression;
-                if (newExpression == null)
-                    throw new TinyIoCConstructorResolutionException(typeof(RegisterType));
-
-                var constructorInfo = newExpression.Constructor;
-                if (constructorInfo == null)
-                    throw new TinyIoCConstructorResolutionException(typeof(RegisterType));
-
-                var currentFactory = _Container.GetCurrentFactory(_Registration);
-                if (currentFactory == null)
-                    throw new TinyIoCConstructorResolutionException(typeof(RegisterType));
-
-                currentFactory.SetConstructor(constructorInfo);
-
-                return this;
-            }
-#endif
-        }
-
-        /// <summary>
-        /// Registration options for "fluent" API when registering multiple implementations
-        /// </summary>
-        public sealed class MultiRegisterOptions
-        {
-            private IEnumerable<RegisterOptions> _RegisterOptions;
-
-            /// <summary>
-            /// Initializes a new instance of the MultiRegisterOptions class.
-            /// </summary>
-            /// <param name="registerOptions">Registration options</param>
-            public MultiRegisterOptions(IEnumerable<RegisterOptions> registerOptions)
-            {
-                _RegisterOptions = registerOptions;
-            }
-
-            /// <summary>
-            /// Make registration a singleton (single instance) if possible
-            /// </summary>
-            /// <returns>RegisterOptions</returns>
-            /// <exception cref="TinyIoCInstantiationTypeException"></exception>
-            public MultiRegisterOptions AsSingleton()
-            {
-                _RegisterOptions = ExecuteOnAllRegisterOptions(ro => ro.AsSingleton());
-                return this;
-            }
-
-            /// <summary>
-            /// Make registration multi-instance if possible
-            /// </summary>
-            /// <returns>MultiRegisterOptions</returns>
-            /// <exception cref="TinyIoCInstantiationTypeException"></exception>
-            public MultiRegisterOptions AsMultiInstance()
-            {
-                _RegisterOptions = ExecuteOnAllRegisterOptions(ro => ro.AsMultiInstance());
-                return this;
-            }
-
-            private IEnumerable<RegisterOptions> ExecuteOnAllRegisterOptions(Func<RegisterOptions, RegisterOptions> action)
-            {
-                var newRegisterOptions = new List<RegisterOptions>();
-
-                foreach (var registerOption in _RegisterOptions)
-                {
-                    newRegisterOptions.Add(action(registerOption));
-                }
-
-                return newRegisterOptions;
-            }
-        }
-        #endregion
-
-        #region Public API
-        #region Child Containers
-        public TinyIoCContainer GetChildContainer()
-        {
-            return new TinyIoCContainer(this);
-        }
-        #endregion
-
-        #region Registration
-        /// <summary>
-        /// Attempt to automatically register all non-generic classes and interfaces in the current app domain.
-        /// 
-        /// If more than one class implements an interface then only one implementation will be registered
-        /// although no error will be thrown.
-        /// </summary>
-        public void AutoRegister()
-        {
-#if APPDOMAIN_GETASSEMBLIES
-            AutoRegisterInternal(AppDomain.CurrentDomain.GetAssemblies().Where(a => !IsIgnoredAssembly(a)), true);
-#else
-            AutoRegisterInternal(new Assembly[] {this.GetType().Assembly}, true);
-#endif
-        }
-
-        /// <summary>
-        /// Attempt to automatically register all non-generic classes and interfaces in the current app domain.
-        /// </summary>
-        /// <param name="ignoreDuplicateImplementations">Whether to ignore duplicate implementations of an interface/base class. False=throw an exception</param>
-        /// <exception cref="TinyIoCAutoRegistrationException"/>
-        public void AutoRegister(bool ignoreDuplicateImplementations)
-        {
-#if APPDOMAIN_GETASSEMBLIES
-            AutoRegisterInternal(AppDomain.CurrentDomain.GetAssemblies().Where(a => !IsIgnoredAssembly(a)), ignoreDuplicateImplementations);
-#else
-            AutoRegisterInternal(new Assembly[] { this.GetType().Assembly }, ignoreDuplicateImplementations);
-#endif
-        }
-
-        /// <summary>
-        /// Attempt to automatically register all non-generic classes and interfaces in the specified assembly
-        /// 
-        /// If more than one class implements an interface then only one implementation will be registered
-        /// although no error will be thrown.
-        /// </summary>
-        /// <param name="assembly">Assembly to process</param>
-        public void AutoRegister(Assembly assembly)
-        {
-            AutoRegisterInternal(new Assembly[] { assembly }, true);
-        }
-
-        /// <summary>
-        /// Attempt to automatically register all non-generic classes and interfaces in the specified assembly
-        /// </summary>
-        /// <param name="assembly">Assembly to process</param>
-        /// <param name="ignoreDuplicateImplementations">Whether to ignore duplicate implementations of an interface/base class. False=throw an exception</param>
-        /// <exception cref="TinyIoCAutoRegistrationException"/>
-        public void AutoRegister(Assembly assembly, bool ignoreDuplicateImplementations)
-        {
-            AutoRegisterInternal(new Assembly[] { assembly }, ignoreDuplicateImplementations);
-        }
-
-        /// <summary>
-        /// Attempt to automatically register all non-generic classes and interfaces in the specified assemblies
-        /// 
-        /// If more than one class implements an interface then only one implementation will be registered
-        /// although no error will be thrown.
-        /// </summary>
-        /// <param name="assemblies">Assemblies to process</param>
-        public void AutoRegister(IEnumerable<Assembly> assemblies)
-        {
-            AutoRegisterInternal(assemblies, true);
-        }
-
-        /// <summary>
-        /// Attempt to automatically register all non-generic classes and interfaces in the specified assemblies
-        /// </summary>
-        /// <param name="assemblies">Assemblies to process</param>
-        /// <param name="ignoreDuplicateImplementations">Whether to ignore duplicate implementations of an interface/base class. False=throw an exception</param>
-        /// <exception cref="TinyIoCAutoRegistrationException"/>
-        public void AutoRegister(IEnumerable<Assembly> assemblies, bool ignoreDuplicateImplementations)
-        {
-            AutoRegisterInternal(assemblies, ignoreDuplicateImplementations);
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with default options.
-        /// </summary>
-        /// <param name="registerImplementation">Type to register</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerImplementation)
-        {
-            return ExecuteGenericRegister(new Type[] { registerImplementation }, new Type[] { }, null);
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with default options.
-        /// </summary>
-        /// <param name="registerImplementation">Type to register</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerImplementation, string name)
-        {
-            return ExecuteGenericRegister(new Type[] { registerImplementation }, new Type[] { typeof(string) }, new object[] { name });
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a given implementation and default options.
-        /// </summary>
-        /// <param name="registerType">Type to register</param>
-        /// <param name="registerImplementation">Type to instantiate that implements RegisterType</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerType, Type registerImplementation)
-        {
-            return ExecuteGenericRegister(new Type[] { registerType, registerImplementation }, new Type[] { }, null);
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a given implementation and default options.
-        /// </summary>
-        /// <param name="registerType">Type to register</param>
-        /// <param name="registerImplementation">Type to instantiate that implements RegisterType</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerType, Type registerImplementation, string name)
-        {
-            return ExecuteGenericRegister(new Type[] { registerType, registerImplementation }, new Type[] { typeof(string) }, new object[] { name });
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <param name="registerImplementation">Type to register</param>
-        /// <param name="instance">Instance of RegisterType to register</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerImplementation, object instance)
-        {
-            return ExecuteGenericRegister(new Type[] { registerImplementation }, new Type[] { registerImplementation }, new object[] { instance });
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <param name="registerImplementation">Type to register</param>
-        /// <param name="instance">Instance of RegisterType to register</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerImplementation, object instance, string name)
-        {
-            return ExecuteGenericRegister(new Type[] { registerImplementation }, new Type[] { registerImplementation, typeof(string) }, new object[] { instance, name });
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <param name="registerType">Type to register</param>
-        /// <param name="registerImplementation">Type of instance to register that implements RegisterType</param>
-        /// <param name="instance">Instance of RegisterImplementation to register</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerType, Type implementationType, object instance)
-        {
-            return ExecuteGenericRegister(new Type[] { registerType, implementationType }, new Type[] { implementationType }, new object[] { instance });
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <param name="registerType">Type to register</param>
-        /// <param name="registerImplementation">Type of instance to register that implements RegisterType</param>
-        /// <param name="instance">Instance of RegisterImplementation to register</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register(Type registerType, Type implementationType, object instance, string name)
-        {
-            return ExecuteGenericRegister(new Type[] { registerType, implementationType }, new Type[] { implementationType, typeof(string) }, new object[] { instance, name });
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with default options.
-        /// </summary>
-        /// <typeparam name="RegisterImplementation">Type to register</typeparam>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType>()
-            where RegisterType : class
-        {
-            return RegisterInternal(typeof(RegisterType), string.Empty, GetDefaultObjectFactory<RegisterType, RegisterType>());
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with default options.
-        /// </summary>
-        /// <typeparam name="RegisterImplementation">Type to register</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType>(string name)
-            where RegisterType : class
-        {
-            return RegisterInternal(typeof(RegisterType), name, GetDefaultObjectFactory<RegisterType, RegisterType>());
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a given implementation and default options.
-        /// </summary>
-        /// <typeparam name="RegisterType">Type to register</typeparam>
-        /// <typeparam name="RegisterImplementation">Type to instantiate that implements RegisterType</typeparam>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType, RegisterImplementation>()
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            return RegisterInternal(typeof(RegisterType), string.Empty, GetDefaultObjectFactory<RegisterType, RegisterImplementation>());
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a given implementation and default options.
-        /// </summary>
-        /// <typeparam name="RegisterType">Type to register</typeparam>
-        /// <typeparam name="RegisterImplementation">Type to instantiate that implements RegisterType</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType, RegisterImplementation>(string name)
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            return RegisterInternal(typeof(RegisterType), name, GetDefaultObjectFactory<RegisterType, RegisterImplementation>());
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <typeparam name="RegisterImplementation">Type to register</typeparam>
-        /// <param name="instance">Instance of RegisterType to register</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType>(RegisterType instance)
-           where RegisterType : class
-        {
-            return RegisterInternal(typeof(RegisterType), string.Empty, new InstanceFactory<RegisterType, RegisterType>(instance));
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <typeparam name="RegisterImplementation">Type to register</typeparam>
-        /// <param name="instance">Instance of RegisterType to register</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType>(RegisterType instance, string name)
-            where RegisterType : class
-        {
-            return RegisterInternal(typeof(RegisterType), name, new InstanceFactory<RegisterType, RegisterType>(instance));
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <typeparam name="RegisterType">Type to register</typeparam>
-        /// <typeparam name="RegisterImplementation">Type of instance to register that implements RegisterType</typeparam>
-        /// <param name="instance">Instance of RegisterImplementation to register</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType, RegisterImplementation>(RegisterImplementation instance)
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            return RegisterInternal(typeof(RegisterType), string.Empty, new InstanceFactory<RegisterType, RegisterImplementation>(instance));
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a specific, strong referenced, instance.
-        /// </summary>
-        /// <typeparam name="RegisterType">Type to register</typeparam>
-        /// <typeparam name="RegisterImplementation">Type of instance to register that implements RegisterType</typeparam>
-        /// <param name="instance">Instance of RegisterImplementation to register</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType, RegisterImplementation>(RegisterImplementation instance, string name)
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            return RegisterInternal(typeof(RegisterType), name, new InstanceFactory<RegisterType, RegisterImplementation>(instance));
-        }
-
-        /// <summary>
-        /// Creates/replaces a container class registration with a user specified factory
-        /// </summary>
-        /// <typeparam name="RegisterType">Type to register</typeparam>
-        /// <param name="factory">Factory/lambda that returns an instance of RegisterType</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType>(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory)
-            where RegisterType : class
-        {
-            return RegisterInternal(typeof(RegisterType), string.Empty, new DelegateFactory<RegisterType>(factory));
-        }
-
-        /// <summary>
-        /// Creates/replaces a named container class registration with a user specified factory
-        /// </summary>
-        /// <typeparam name="RegisterType">Type to register</typeparam>
-        /// <param name="factory">Factory/lambda that returns an instance of RegisterType</param>
-        /// <param name="name">Name of registation</param>
-        /// <returns>RegisterOptions for fluent API</returns>
-        public RegisterOptions Register<RegisterType>(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory, string name)
-            where RegisterType : class
-        {
-            return RegisterInternal(typeof(RegisterType), name, new DelegateFactory<RegisterType>(factory));
-        }
-
-        /// <summary>
-        /// Register multiple implementations of a type.
-        /// 
-        /// Internally this registers each implementation using the full name of the class as its registration name.
-        /// </summary>
-        /// <typeparam name="RegisterType">Type that each implementation implements</typeparam>
-        /// <param name="types">Types that implement RegisterType</param>
-        /// <returns>MultiRegisterOptions for the fluent API</returns>
-        public MultiRegisterOptions RegisterMultiple<RegisterType>(IEnumerable<Type> types)
-        {
-            if (types == null)
-                throw new ArgumentNullException("types", "types is null.");
-
-            foreach (var type in types)
-                if (!typeof(RegisterType).IsAssignableFrom(type))
-                    throw new ArgumentException(String.Format("types: The type {0} is not assignable from {1}", typeof(RegisterType).FullName, type.FullName));
-
-            if (types.Count() != types.Distinct().Count())
-                throw new ArgumentException("types: The same implementation type cannot be specificed multiple times");
-
-            var registerOptions = new List<RegisterOptions>();
-
-            foreach (var type in types)
-            {
-                registerOptions.Add(Register(typeof(RegisterType), type, type.FullName));
-            }
-
-            return new MultiRegisterOptions(registerOptions);
-        }
-        #endregion
-
-        #region Resolution
-        /// <summary>
-        /// Attempts to resolve a type using default options.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType), NamedParameterOverloads.Default, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using specified options.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, ResolveOptions options)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType), NamedParameterOverloads.Default, options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options and the supplied name.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, string name)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType, name), NamedParameterOverloads.Default, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using supplied options and  name.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, string name, ResolveOptions options)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType, name), NamedParameterOverloads.Default, options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options and the supplied constructor parameters.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, NamedParameterOverloads parameters)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType), parameters, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using specified options and the supplied constructor parameters.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType), parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options and the supplied constructor parameters and name.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, string name, NamedParameterOverloads parameters)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType, name), parameters, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a named type using specified options and the supplied constructor parameters.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public object Resolve(Type resolveType, string name, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            return ResolveInternal(new TypeRegistration(resolveType, name), parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>()
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType));
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using specified options.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(ResolveOptions options)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options and the supplied name.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(string name)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), name);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using supplied options and  name.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(string name, ResolveOptions options)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), name, options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options and the supplied constructor parameters.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(NamedParameterOverloads parameters)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), parameters);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using specified options and the supplied constructor parameters.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(NamedParameterOverloads parameters, ResolveOptions options)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a type using default options and the supplied constructor parameters and name.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(string name, NamedParameterOverloads parameters)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), name, parameters);
-        }
-
-        /// <summary>
-        /// Attempts to resolve a named type using specified options and the supplied constructor parameters.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Instance of type</returns>
-        /// <exception cref="TinyIoCResolutionException">Unable to resolve the type.</exception>
-        public ResolveType Resolve<ResolveType>(string name, NamedParameterOverloads parameters, ResolveOptions options)
-            where ResolveType : class
-        {
-            return (ResolveType)Resolve(typeof(ResolveType), name, parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with default options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType), NamedParameterOverloads.Default, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with default options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        private bool CanResolve(Type resolveType, string name)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType, name), NamedParameterOverloads.Default, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with the specified options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType, ResolveOptions options)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType), NamedParameterOverloads.Default, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with the specified options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType, string name, ResolveOptions options)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType, name), NamedParameterOverloads.Default, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with the supplied constructor parameters and default options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType, NamedParameterOverloads parameters)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType), parameters, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with the supplied constructor parameters and default options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType, string name, NamedParameterOverloads parameters)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType, name), parameters, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with the supplied constructor parameters options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType), parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with the supplied constructor parameters options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <param name="resolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve(Type resolveType, string name, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            return CanResolveInternal(new TypeRegistration(resolveType, name), parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with default options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>()
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType));
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with default options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(string name)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), name);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with the specified options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(ResolveOptions options)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with the specified options.
-        ///
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(string name, ResolveOptions options)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), name, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with the supplied constructor parameters and default options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(NamedParameterOverloads parameters)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), parameters);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with the supplied constructor parameters and default options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(string name, NamedParameterOverloads parameters)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), name, parameters);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given type can be resolved with the supplied constructor parameters options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(NamedParameterOverloads parameters, ResolveOptions options)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), parameters, options);
-        }
-
-        /// <summary>
-        /// Attempts to predict whether a given named type can be resolved with the supplied constructor parameters options.
-        ///
-        /// Parameters are used in conjunction with normal container resolution to find the most suitable constructor (if one exists).
-        /// All user supplied parameters must exist in at least one resolvable constructor of RegisterType or resolution will fail.
-        /// 
-        /// Note: Resolution may still fail if user defined factory registations fail to construct objects when called.
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User supplied named parameter overloads</param>
-        /// <param name="options">Resolution options</param>
-        /// <returns>Bool indicating whether the type can be resolved</returns>
-        public bool CanResolve<ResolveType>(string name, NamedParameterOverloads parameters, ResolveOptions options)
-            where ResolveType : class
-        {
-            return CanResolve(typeof(ResolveType), name, parameters, options);
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the given options
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, ResolveOptions options, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options and given name
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, string name, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, name);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the given options and name
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, string name, ResolveOptions options, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, name, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options and supplied constructor parameters
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, NamedParameterOverloads parameters, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, parameters);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options and supplied name and constructor parameters
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, string name, NamedParameterOverloads parameters, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, name, parameters);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the supplied options and constructor parameters
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, NamedParameterOverloads parameters, ResolveOptions options, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, parameters, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the supplied name, options and constructor parameters
-        /// </summary>
-        /// <param name="ResolveType">Type to resolve</param>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve(Type resolveType, string name, NamedParameterOverloads parameters, ResolveOptions options, out object resolvedType)
-        {
-            try
-            {
-                resolvedType = Resolve(resolveType, name, parameters, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = null;
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>();
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the given options
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(ResolveOptions options, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options and given name
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(string name, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(name);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the given options and name
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(string name, ResolveOptions options, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(name, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options and supplied constructor parameters
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(NamedParameterOverloads parameters, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(parameters);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the default options and supplied name and constructor parameters
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(string name, NamedParameterOverloads parameters, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(name, parameters);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the supplied options and constructor parameters
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(NamedParameterOverloads parameters, ResolveOptions options, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(parameters, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Attemps to resolve a type using the supplied name, options and constructor parameters
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolve</typeparam>
-        /// <param name="name">Name of registration</param>
-        /// <param name="parameters">User specified constructor parameters</param>
-        /// <param name="options">Resolution options</param>
-        /// <param name="resolvedType">Resolved type or default if resolve fails</param>
-        /// <returns>True if resolved sucessfully, false otherwise</returns>
-        public bool TryResolve<ResolveType>(string name, NamedParameterOverloads parameters, ResolveOptions options, out ResolveType resolvedType)
-            where ResolveType : class
-        {
-            try
-            {
-                resolvedType = Resolve<ResolveType>(name, parameters, options);
-                return true;
-            }
-            catch (TinyIoCResolutionException)
-            {
-                resolvedType = default(ResolveType);
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Returns all registrations of a type
-        /// </summary>
-        /// <param name="ResolveType">Type to resolveAll</param>
-        /// <param name="includeUnnamed">Whether to include un-named (default) registrations</param>
-        /// <returns>IEnumerable</returns>
-        public IEnumerable<object> ResolveAll(Type resolveType, bool includeUnnamed)
-        {
-            return ResolveAllInternal(resolveType, includeUnnamed).Select(o => o);
-        }
-
-        /// <summary>
-        /// Returns all registrations of a type, both named and unnamed
-        /// </summary>
-        /// <param name="ResolveType">Type to resolveAll</param>
-        /// <returns>IEnumerable</returns>
-        public IEnumerable<object> ResolveAll(Type resolveType)
-        {
-            return ResolveAll(resolveType, false);
-        }
-
-        /// <summary>
-        /// Returns all registrations of a type
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolveAll</typeparam>
-        /// <param name="includeUnnamed">Whether to include un-named (default) registrations</param>
-        /// <returns>IEnumerable</returns>
-        public IEnumerable<ResolveType> ResolveAll<ResolveType>(bool includeUnnamed)
-            where ResolveType : class
-        {
-            foreach (var resolvedType in ResolveAll(typeof(ResolveType), includeUnnamed))
-            {
-                yield return resolvedType as ResolveType;
-            }
-        }
-
-        /// <summary>
-        /// Returns all registrations of a type, both named and unnamed
-        /// </summary>
-        /// <typeparam name="ResolveType">Type to resolveAll</typeparam>
-        /// <param name="includeUnnamed">Whether to include un-named (default) registrations</param>
-        /// <returns>IEnumerable</returns>
-        public IEnumerable<ResolveType> ResolveAll<ResolveType>()
-            where ResolveType : class
-        {
-            return ResolveAll<ResolveType>(true);
-        }
-
-        /// <summary>
-        /// Attempts to resolve all public property dependencies on the given object.
-        /// </summary>
-        /// <param name="input">Object to "build up"</param>
-        public void BuildUp(object input)
-        {
-            BuildUpInternal(input, ResolveOptions.Default);
-        }
-
-        /// <summary>
-        /// Attempts to resolve all public property dependencies on the given object using the given resolve options.
-        /// </summary>
-        /// <param name="input">Object to "build up"</param>
-        /// <param name="resolveOptions">Resolve options to use</param>
-        public void BuildUp(object input, ResolveOptions resolveOptions)
-        {
-            BuildUpInternal(input, resolveOptions);
-        }
-        #endregion
-        #endregion
-
-        #region Object Factories
-        private abstract class ObjectFactoryBase
-        {
-            /// <summary>
-            /// Whether to assume this factory sucessfully constructs its objects
-            /// 
-            /// Generally set to true for delegate style factories as CanResolve cannot delve
-            /// into the delegates they contain.
-            /// </summary>
-            public virtual bool AssumeConstruction { get { return false; } }
-
-            /// <summary>
-            /// The type the factory instantiates
-            /// </summary>
-            public abstract Type CreatesType { get; }
-
-            /// <summary>
-            /// Constructor to use, if specified
-            /// </summary>
-            public ConstructorInfo Constructor { get; protected set; }
-
-            /// <summary>
-            /// Create the type
-            /// </summary>
-            /// <param name="container">Container that requested the creation</param>
-            /// <param name="parameters">Any user parameters passed</param>
-            /// <returns></returns>
-            public abstract object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options);
-
-            public virtual ObjectFactoryBase SingletonVariant
-            {
-                get
-                {
-                    throw new TinyIoCRegistrationException(this.GetType(), "singleton");
-                }
-            }
-
-            public virtual ObjectFactoryBase MultiInstanceVariant
-            {
-                get
-                {
-                    throw new TinyIoCRegistrationException(this.GetType(), "multi-instance");
-                }
-            }
-
-            public virtual ObjectFactoryBase StrongReferenceVariant
-            {
-                get
-                {
-                    throw new TinyIoCRegistrationException(this.GetType(), "strong reference");
-                }
-            }
-
-            public virtual ObjectFactoryBase WeakReferenceVariant
-            {
-                get
-                {
-                    throw new TinyIoCRegistrationException(this.GetType(), "weak reference");
-                }
-            }
-
-            public virtual void SetConstructor(ConstructorInfo constructor)
-            {
-                Constructor = constructor;
-            }
-        }
-
-        /// <summary>
-        /// IObjectFactory that creates new instances of types for each resolution
-        /// </summary>
-        /// <typeparam name="RegisterType">Registered type</typeparam>
-        /// <typeparam name="RegisterImplementation">Type to construct to fullful request for RegisteredType</typeparam>
-        private class MultiInstanceFactory<RegisterType, RegisterImplementation> : ObjectFactoryBase
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            public override Type CreatesType { get { return typeof(RegisterImplementation); } }
-
-            public MultiInstanceFactory()
-            {
-                if (typeof(RegisterImplementation).IsAbstract || typeof(RegisterImplementation).IsInterface)
-                    throw new TinyIoCRegistrationTypeException(typeof(RegisterImplementation), "MultiInstanceFactory");
-            }
-
-            public override object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
-            {
-                try
-                {
-                    return container.ConstructType(typeof(RegisterImplementation), Constructor, parameters, options);
-                }
-                catch (TinyIoCResolutionException ex)
-                {
-                    throw new TinyIoCResolutionException(typeof(RegisterImplementation), ex);
-                }
-            }
-
-            public override ObjectFactoryBase SingletonVariant
-            {
-                get
-                {
-                    return new SingletonFactory<RegisterType, RegisterImplementation>();
-                }
-            }
-
-            public override ObjectFactoryBase MultiInstanceVariant
-            {
-                get
-                {
-                    return this;
-                }
-            }
-        }
-
-        /// <summary>
-        /// IObjectFactory that invokes a specified delegate to construct the object
-        /// </summary>
-        /// <typeparam name="RegisterType">Registered type to be constructed</typeparam>
-        private class DelegateFactory<RegisterType> : ObjectFactoryBase
-            where RegisterType : class
-        {
-            private Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> _factory;
-
-            public override bool AssumeConstruction { get { return true; } }
-
-            public override Type CreatesType { get { return typeof(RegisterType); } }
-
-            public override object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
-            {
-                try
-                {
-                    return _factory.Invoke(container, parameters);
-                }
-                catch (Exception ex)
-                {
-                    throw new TinyIoCResolutionException(typeof(RegisterType), ex);
-                }
-            }
-
-            public DelegateFactory(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory)
-            {
-                if (factory == null)
-                    throw new ArgumentNullException("factory");
-
-                _factory = factory;
-            }
-
-            public override ObjectFactoryBase WeakReferenceVariant
-            {
-                get
-                {
-                    return new WeakDelegateFactory<RegisterType>(_factory);
-                }
-            }
-
-            public override ObjectFactoryBase StrongReferenceVariant
-            {
-                get
-                {
-                    return this;
-                }
-            }
-
-            public override void SetConstructor(ConstructorInfo constructor)
-            {
-                throw new TinyIoCConstructorResolutionException("Constructor selection is not possible for delegate factory registrations");
-            }
-        }
-
-        /// <summary>
-        /// IObjectFactory that invokes a specified delegate to construct the object
-        /// 
-        /// Holds the delegate using a weak reference
-        /// </summary>
-        /// <typeparam name="RegisterType">Registered type to be constructed</typeparam>
-        private class WeakDelegateFactory<RegisterType> : ObjectFactoryBase
-            where RegisterType : class
-        {
-            private WeakReference _factory;
-
-            public override bool AssumeConstruction { get { return true; } }
-
-            public override Type CreatesType { get { return typeof(RegisterType); } }
-
-            public override object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
-            {
-                var factory = _factory.Target as Func<TinyIoCContainer, NamedParameterOverloads, RegisterType>;
-
-                if (factory == null)
-                    throw new TinyIoCWeakReferenceException(typeof(RegisterType));
-
-                try
-                {
-                    return factory.Invoke(container, parameters);
-                }
-                catch (Exception ex)
-                {
-                    throw new TinyIoCResolutionException(typeof(RegisterType), ex);
-                }
-            }
-
-            public WeakDelegateFactory(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory)
-            {
-                if (factory == null)
-                    throw new ArgumentNullException("factory");
-
-                _factory = new WeakReference(factory);
-            }
-
-            public override ObjectFactoryBase StrongReferenceVariant
-            {
-                get
-                {
-                    var factory = _factory.Target as Func<TinyIoCContainer, NamedParameterOverloads, RegisterType>;
-
-                    if (factory == null)
-                        throw new TinyIoCWeakReferenceException(typeof(RegisterType));
-
-                    return new DelegateFactory<RegisterType>(factory);
-                }
-            }
-
-            public override ObjectFactoryBase WeakReferenceVariant
-            {
-                get
-                {
-                    return this;
-                }
-            }
-
-            public override void SetConstructor(ConstructorInfo constructor)
-            {
-                throw new TinyIoCConstructorResolutionException("Constructor selection is not possible for delegate factory registrations");
-            }
-        }
-
-        /// <summary>
-        /// Stores an particular instance to return for a type
-        /// </summary>
-        /// <typeparam name="RegisterType">Registered type</typeparam>
-        /// <typeparam name="RegisterImplementation">Type of the instance</typeparam>
-        private class InstanceFactory<RegisterType, RegisterImplementation> : ObjectFactoryBase, IDisposable
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            private RegisterImplementation _instance;
-
-            public override bool AssumeConstruction { get { return true; } }
-
-            public InstanceFactory(RegisterImplementation instance)
-            {
-                _instance = instance;
-            }
-
-            public override Type CreatesType
-            {
-                get { return typeof(RegisterImplementation); }
-            }
-
-            public override object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
-            {
-                return _instance;
-            }
-
-            public override ObjectFactoryBase MultiInstanceVariant
-            {
-                get
-                {
-                    return new MultiInstanceFactory<RegisterType, RegisterImplementation>();
-                }
-            }
-
-            public override ObjectFactoryBase WeakReferenceVariant
-            {
-                get
-                {
-                    return new WeakInstanceFactory<RegisterType, RegisterImplementation>(_instance);
-                }
-            }
-
-            public override ObjectFactoryBase StrongReferenceVariant
-            {
-                get
-                {
-                    return this;
-                }
-            }
-
-            public override void SetConstructor(ConstructorInfo constructor)
-            {
-                throw new TinyIoCConstructorResolutionException("Constructor selection is not possible for instance factory registrations");
-            }
-
-            public void Dispose()
-            {
-                var disposable = _instance as IDisposable;
-
-                if (disposable != null)
-                    disposable.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Stores an particular instance to return for a type
-        /// 
-        /// Stores the instance with a weak reference
-        /// </summary>
-        /// <typeparam name="RegisterType">Registered type</typeparam>
-        /// <typeparam name="RegisterImplementation">Type of the instance</typeparam>
-        private class WeakInstanceFactory<RegisterType, RegisterImplementation> : ObjectFactoryBase, IDisposable
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            private WeakReference _instance;
-
-            public WeakInstanceFactory(RegisterImplementation instance)
-            {
-                _instance = new WeakReference(instance);
-            }
-
-            public override Type CreatesType
-            {
-                get { return typeof(RegisterImplementation); }
-            }
-
-            public override object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
-            {
-                var instance = _instance.Target as RegisterImplementation;
-
-                if (instance == null)
-                    throw new TinyIoCWeakReferenceException(typeof(RegisterType));
-
-                return instance;
-            }
-
-            public override ObjectFactoryBase MultiInstanceVariant
-            {
-                get
-                {
-                    return new MultiInstanceFactory<RegisterType, RegisterImplementation>();
-                }
-            }
-
-            public override ObjectFactoryBase WeakReferenceVariant
-            {
-                get
-                {
-                    return this;
-                }
-            }
-
-            public override ObjectFactoryBase StrongReferenceVariant
-            {
-                get
-                {
-                    var instance = _instance.Target as RegisterImplementation;
-
-                    if (instance == null)
-                        throw new TinyIoCWeakReferenceException(typeof(RegisterType));
-
-                    return new InstanceFactory<RegisterType, RegisterImplementation>(instance);
-                }
-            }
-
-            public override void SetConstructor(ConstructorInfo constructor)
-            {
-                throw new TinyIoCConstructorResolutionException("Constructor selection is not possible for instance factory registrations");
-            }
-
-            public void Dispose()
-            {
-                var disposable = _instance.Target as IDisposable;
-
-                if (disposable != null)
-                    disposable.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// A factory that lazy instantiates a type and always returns the same instance
-        /// </summary>
-        /// <typeparam name="RegisterType">Registered type</typeparam>
-        /// <typeparam name="RegisterImplementation">Type to instantiate</typeparam>
-        private class SingletonFactory<RegisterType, RegisterImplementation> : ObjectFactoryBase, IDisposable
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            private readonly object SingletonLock = new object();
-            private RegisterImplementation _Current;
-
-            public SingletonFactory()
-            {
-                if (typeof(RegisterImplementation).IsAbstract || typeof(RegisterImplementation).IsInterface)
-                    throw new TinyIoCRegistrationTypeException(typeof(RegisterImplementation), "SingletonFactory");
-            }
-
-            public override Type CreatesType
-            {
-                get { return typeof(RegisterImplementation); }
-            }
-
-            public override object GetObject(TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
-            {
-                if (parameters.Count != 0)
-                    throw new ArgumentException("Cannot specify parameters for singleton types");
-
-                lock (SingletonLock)
-                    if (_Current == null)
-                        _Current = container.ConstructType(typeof(RegisterImplementation), Constructor, options) as RegisterImplementation;
-
-                return _Current;
-            }
-
-            public override ObjectFactoryBase SingletonVariant
-            {
-                get
-                {
-                    return this;
-                }
-            }
-
-            public override ObjectFactoryBase MultiInstanceVariant
-            {
-                get
-                {
-                    return new MultiInstanceFactory<RegisterType, RegisterImplementation>();
-                }
-            }
-
-            public void Dispose()
-            {
-                if (_Current != null)
-                {
-                    var disposable = _Current as IDisposable;
-
-                    if (disposable != null)
-                        disposable.Dispose();
-                }
-            }
-        }
-        #endregion
-
-        #region Singleton Container
-        private static readonly TinyIoCContainer _Current = new TinyIoCContainer();
-
-        static TinyIoCContainer()
-        {
-        }
-
-        /// <summary>
-        /// Lazy created Singleton instance of the container for simple scenarios
-        /// </summary>
-        public static TinyIoCContainer Current
-        {
-            get
-            {
-                return _Current;
-            }
-        }
-        #endregion
-
-        #region Type Registrations
-        public sealed class TypeRegistration
-        {
-            public Type Type { get; private set; }
-            public string Name { get; private set; }
-
-            public TypeRegistration(Type type)
-                : this(type, string.Empty)
-            {
-            }
-
-            public TypeRegistration(Type type, string name)
-            {
-                Type = type;
-                Name = name;
-            }
-
-            public override bool Equals(object obj)
-            {
-                var typeRegistration = obj as TypeRegistration;
-
-                if (typeRegistration == null)
-                    return false;
-
-                if (Type != typeRegistration.Type)
-                    return false;
-
-                if (String.Compare(Name, typeRegistration.Name, StringComparison.Ordinal) != 0)
-                    return false;
-
-                return true;
-            }
-
-            public override int GetHashCode()
-            {
-                return String.Format("{0}|{1}", Type.FullName, Name).GetHashCode();
-            }
-        }
-        private readonly SafeDictionary<TypeRegistration, ObjectFactoryBase> _RegisteredTypes;
-        #endregion
-
-        #region Constructors
-        public TinyIoCContainer()
-        {
-            _RegisteredTypes = new SafeDictionary<TypeRegistration, ObjectFactoryBase>();
-
-            RegisterDefaultTypes();
-        }
-
-        TinyIoCContainer _Parent;
-        private TinyIoCContainer(TinyIoCContainer parent)
-            : this()
-        {
-            _Parent = parent;
-        }
-        #endregion
-
-        #region Internal Methods
-        private readonly object _AutoRegisterLock = new object();
-        private void AutoRegisterInternal(IEnumerable<Assembly> assemblies, bool ignoreDuplicateImplementations)
-        {
-            lock (_AutoRegisterLock)
-            {
-                var defaultFactoryMethod = this.GetType().GetMethod("GetDefaultObjectFactory", BindingFlags.NonPublic | BindingFlags.Instance);
-
-                var types = assemblies.SelectMany(a => a.GetTypes()).Where(t => !IsIgnoredType(t)).ToList();
-
-                var concreteTypes = from type in types
-                                    where (type.IsClass == true) && (type.IsAbstract == false) && (type != this.GetType() && (type.DeclaringType != this.GetType()) && (!type.IsGenericTypeDefinition))
-                                    select type;
-
-                foreach (var type in concreteTypes)
-                {
-                    Type[] genericTypes = { type, type };
-                    var genericDefaultFactoryMethod = defaultFactoryMethod.MakeGenericMethod(genericTypes);
-                    try
-                    {
-                        RegisterInternal(type, string.Empty, genericDefaultFactoryMethod.Invoke(this, null) as ObjectFactoryBase);
-                    }
-                    catch (MethodAccessException)
-                    {
-                        // Ignore methods we can't access - added for Silverlight
-                    }
-                }
-
-                var abstractInterfaceTypes = from type in types
-                                             where ((type.IsInterface == true || type.IsAbstract == true) && (type.DeclaringType != this.GetType()) && (!type.IsGenericTypeDefinition))
-                                             select type;
-
-                foreach (var type in abstractInterfaceTypes)
-                {
-                    var implementations = from implementationType in concreteTypes
-                                          where implementationType.GetInterfaces().Contains(type) || implementationType.BaseType == type
-                                          select implementationType;
-
-                    if (!ignoreDuplicateImplementations && implementations.Count() > 1)
-                        throw new TinyIoCAutoRegistrationException(type, implementations);
-
-                    var firstImplementation = implementations.FirstOrDefault();
-                    if (firstImplementation != null)
-                    {
-                        Type[] genericTypes = { type, firstImplementation };
-                        var genericDefaultFactoryMethod = defaultFactoryMethod.MakeGenericMethod(genericTypes);
-                        try
-                        {
-                            RegisterInternal(type, string.Empty, genericDefaultFactoryMethod.Invoke(this, null) as ObjectFactoryBase);
-                        }
-                        catch (MethodAccessException)
-                        {
-                            // Ignore methods we can't access - added for Silverlight
-                        }
-                    }
-                }
-            }
-        }
-
-        private bool IsIgnoredAssembly(Assembly assembly)
-        {
-            // TODO - find a better way to remove "system" assemblies from the auto registration
-            var ignoreChecks = new List<Func<Assembly, bool>>()
-            {
-                asm => asm.FullName.StartsWith("Microsoft.", StringComparison.InvariantCulture),
-                asm => asm.FullName.StartsWith("System.", StringComparison.InvariantCulture),
-                asm => asm.FullName.StartsWith("System,", StringComparison.InvariantCulture),
-                asm => asm.FullName.StartsWith("CR_ExtUnitTest", StringComparison.InvariantCulture),
-                asm => asm.FullName.StartsWith("mscorlib,", StringComparison.InvariantCulture),
-                asm => asm.FullName.StartsWith("CR_VSTest", StringComparison.InvariantCulture),
-                asm => asm.FullName.StartsWith("DevExpress.CodeRush", StringComparison.InvariantCulture),
-            };
-
-            foreach (var check in ignoreChecks)
-            {
-                if (check(assembly))
-                    return true;
-            }
-
-            return false;
-        }
-
-        private bool IsIgnoredType(Type type)
-        {
-            // TODO - find a better way to remove "system" types from the auto registration
-            var ignoreChecks = new List<Func<Type, bool>>()
-            {
-                t => t.FullName.StartsWith("System.", StringComparison.InvariantCulture),
-                t => t.FullName.StartsWith("Microsoft.", StringComparison.InvariantCulture),
-                t => t.IsPrimitive,
-#if !UNBOUND_GENERICS_GETCONSTRUCTORS
-                t => t.IsGenericTypeDefinition,
-#endif
-                t => (t.GetConstructors(BindingFlags.Instance | BindingFlags.Public).Length == 0) && !(t.IsInterface || t.IsAbstract),
-            };
-
-            foreach (var check in ignoreChecks)
-            {
-                if (check(type))
-                    return true;
-            }
-
-            return false;
-        }
-
-        private void RegisterDefaultTypes()
-        {
-            Register<TinyIoCContainer>(this);
-
-#if TINYMESSENGER
-            // Only register the TinyMessenger singleton if we are the root container
-            if (_Parent == null)
-                Register<TinyMessenger.ITinyMessengerHub, TinyMessenger.TinyMessengerHub>();
-#endif
-        }
-
-        private ObjectFactoryBase GetCurrentFactory(TypeRegistration registration)
-        {
-            ObjectFactoryBase current = null;
-
-            _RegisteredTypes.TryGetValue(registration, out current);
-
-            return current;
-        }
-
-        private RegisterOptions RegisterInternal(Type registerType, string name, ObjectFactoryBase factory)
-        {
-            var typeRegistration = new TypeRegistration(registerType, name);
-
-            return AddUpdateRegistration(typeRegistration, factory);
-        }
-
-        private RegisterOptions AddUpdateRegistration(TypeRegistration typeRegistration, ObjectFactoryBase factory)
-        {
-            _RegisteredTypes[typeRegistration] = factory;
-
-            return new RegisterOptions(this, typeRegistration);
-        }
-
-        private void RemoveRegistration(TypeRegistration typeRegistration)
-        {
-            _RegisteredTypes.Remove(typeRegistration);
-        }
-
-        private ObjectFactoryBase GetDefaultObjectFactory<RegisterType, RegisterImplementation>()
-            where RegisterType : class
-            where RegisterImplementation : class, RegisterType
-        {
-            if (typeof(RegisterType).IsInterface || typeof(RegisterType).IsAbstract)
-                return new SingletonFactory<RegisterType, RegisterImplementation>();
-
-            return new MultiInstanceFactory<RegisterType, RegisterImplementation>();
-        }
-
-        private bool CanResolveInternal(TypeRegistration registration, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            if (parameters == null)
-                throw new ArgumentNullException("parameters");
-
-            Type checkType = registration.Type;
-            string name = registration.Name;
-
-            ObjectFactoryBase factory;
-            if (_RegisteredTypes.TryGetValue(new TypeRegistration(checkType, name), out factory))
-            {
-                if (factory.AssumeConstruction)
-                    return true;
-
-                if (factory.Constructor == null)
-                    return (GetBestConstructor(factory.CreatesType, parameters, options) != null) ? true : false;
-                else
-                    return CanConstruct(factory.Constructor, parameters, options);
-            }
-
-            // Fail if requesting named resolution and settings set to fail if unresolved
-            // Or bubble up if we have a parent
-            if (!String.IsNullOrEmpty(name) && options.NamedResolutionFailureAction == NamedResolutionFailureActions.Fail)
-                return (_Parent != null) ? _Parent.CanResolveInternal(registration, parameters, options) : false;
-
-            // Attemped unnamed fallback container resolution if relevant and requested
-            if (!String.IsNullOrEmpty(name) && options.NamedResolutionFailureAction == NamedResolutionFailureActions.AttemptUnnamedResolution)
-            {
-                if (_RegisteredTypes.TryGetValue(new TypeRegistration(checkType), out factory))
-                {
-                    if (factory.AssumeConstruction)
-                        return true;
-
-                    return (GetBestConstructor(factory.CreatesType, parameters, options) != null) ? true : false;
-                }
-            }
-
-            // Check if type is an automatic lazy factory request
-            if (IsAutomaticLazyFactoryRequest(checkType))
-                return true;
-
-            // Check if type is an IEnumerable<ResolveType>
-            if (IsIEnumerableRequest(registration.Type))
-                return true;
-
-            // Attempt unregistered construction if possible and requested
-            // If we cant', bubble if we have a parent
-            if ((options.UnregisteredResolutionAction == UnregisteredResolutionActions.AttemptResolve) || (checkType.IsGenericType && options.UnregisteredResolutionAction == UnregisteredResolutionActions.GenericsOnly))
-                return (GetBestConstructor(checkType, parameters, options) != null) ? true : (_Parent != null) ? _Parent.CanResolveInternal(registration, parameters, options) : false;
-
-            // Bubble resolution up the container tree if we have a parent
-            if (_Parent != null)
-                return _Parent.CanResolveInternal(registration, parameters, options);
-
-            return false;
-        }
-
-        private bool IsIEnumerableRequest(Type type)
-        {
-            if (!type.IsGenericType)
-                return false;
-
-            Type genericType = type.GetGenericTypeDefinition();
-
-            if (genericType == typeof(IEnumerable<>))
-                return true;
-
-            return false;
-        }
-
-        private bool IsAutomaticLazyFactoryRequest(Type type)
-        {
-            if (!type.IsGenericType)
-                return false;
-
-            Type genericType = type.GetGenericTypeDefinition();
-
-            // Just a func
-            if (genericType == typeof(Func<>))
-                return true;
-
-            // 2 parameter func with string as first parameter (name)
-            if ((genericType == typeof(Func<,>) && type.GetGenericArguments()[0] == typeof(string)))
-                return true;
-
-            // 3 parameter func with string as first parameter (name) and IDictionary<string, object> as second (parameters)
-            if ((genericType == typeof(Func<,,>) && type.GetGenericArguments()[0] == typeof(string) && type.GetGenericArguments()[1] == typeof(IDictionary<String, object>)))
-                return true;
-
-            return false;
-        }
-
-        private object ResolveInternal(TypeRegistration registration, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            ObjectFactoryBase factory;
-
-            // Attempt container resolution
-            if (_RegisteredTypes.TryGetValue(registration, out factory))
-            {
-                try
-                {
-                    return factory.GetObject(this, parameters, options);
-                }
-                catch (Exception ex)
-                {
-                    throw new TinyIoCResolutionException(registration.Type, ex);
-                }
-            }
-
-            // Fail if requesting named resolution and settings set to fail if unresolved
-            if (!String.IsNullOrEmpty(registration.Name) && options.NamedResolutionFailureAction == NamedResolutionFailureActions.Fail)
-            {
-                // Bubble resolution up the container tree if we have a parent
-                if (_Parent != null)
-                    return _Parent.ResolveInternal(registration, parameters, options);
-                else
-                    throw new TinyIoCResolutionException(registration.Type);
-            }
-
-            // Attemped unnamed fallback container resolution if relevant and requested
-            if (!String.IsNullOrEmpty(registration.Name) && options.NamedResolutionFailureAction == NamedResolutionFailureActions.AttemptUnnamedResolution)
-            {
-                if (_RegisteredTypes.TryGetValue(new TypeRegistration(registration.Type, string.Empty), out factory))
-                {
-                    try
-                    {
-                        return factory.GetObject(this, parameters, options);
-                    }
-                    catch (Exception ex)
-                    {
-                        throw new TinyIoCResolutionException(registration.Type, ex);
-                    }
-                }
-            }
-
-#if EXPRESSIONS
-            // Attempt to construct an automatic lazy factory if possible
-            if (IsAutomaticLazyFactoryRequest(registration.Type))
-                return GetLazyAutomaticFactoryRequest(registration.Type);
-#endif
-            if (IsIEnumerableRequest(registration.Type))
-                return GetIEnumerableRequest(registration.Type);
-
-            // Attempt unregistered construction if possible and requested
-            if ((options.UnregisteredResolutionAction == UnregisteredResolutionActions.AttemptResolve) || (registration.Type.IsGenericType && options.UnregisteredResolutionAction == UnregisteredResolutionActions.GenericsOnly))
-            {
-                if (!registration.Type.IsAbstract && !registration.Type.IsInterface)
-                    return ConstructType(registration.Type, parameters, options);
-            }
-
-            // Bubble resolution up the container tree if we have a parent
-            if (_Parent != null)
-                return _Parent.ResolveInternal(registration, parameters, options);
-
-            // Unable to resolve - throw
-            throw new TinyIoCResolutionException(registration.Type);
-        }
-
-#if EXPRESSIONS
-        private object GetLazyAutomaticFactoryRequest(Type type)
-        {
-            if (!type.IsGenericType)
-                return null;
-
-            Type genericType = type.GetGenericTypeDefinition();
-            Type[] genericArguments = type.GetGenericArguments();
-
-            // Just a func
-            if (genericType == typeof(Func<>))
-            {
-                Type returnType = genericArguments[0];
-
-                MethodInfo resolveMethod = typeof(TinyIoCContainer).GetMethod("Resolve", new Type[] { });
-                resolveMethod = resolveMethod.MakeGenericMethod(returnType);
-
-                var resolveCall = Expression.Call(Expression.Constant(this), resolveMethod);
-
-                var resolveLambda = Expression.Lambda(resolveCall).Compile();
-
-                return resolveLambda;
-            }
-
-            // 2 parameter func with string as first parameter (name)
-            if ((genericType == typeof(Func<,>)) && (genericArguments[0] == typeof(string)))
-            {
-                Type returnType = genericArguments[1];
-
-                MethodInfo resolveMethod = typeof(TinyIoCContainer).GetMethod("Resolve", new Type[] { typeof(String) });
-                resolveMethod = resolveMethod.MakeGenericMethod(returnType);
-
-                ParameterExpression[] resolveParameters = new ParameterExpression[] { Expression.Parameter(typeof(String), "name") };
-                var resolveCall = Expression.Call(Expression.Constant(this), resolveMethod, resolveParameters);
-
-                var resolveLambda = Expression.Lambda(resolveCall, resolveParameters).Compile();
-
-                return resolveLambda;
-            }
-
-            // 3 parameter func with string as first parameter (name) and IDictionary<string, object> as second (parameters)
-            if ((genericType == typeof(Func<,,>) && type.GetGenericArguments()[0] == typeof(string) && type.GetGenericArguments()[1] == typeof(IDictionary<string, object>)))
-            {
-                Type returnType = genericArguments[2];
-
-                var name = Expression.Parameter(typeof(string), "name");
-                var parameters = Expression.Parameter(typeof(IDictionary<string, object>), "parameters");
-
-                MethodInfo resolveMethod = typeof(TinyIoCContainer).GetMethod("Resolve", new Type[] { typeof(String), typeof(NamedParameterOverloads) });
-                resolveMethod = resolveMethod.MakeGenericMethod(returnType);
-
-                var resolveCall = Expression.Call(Expression.Constant(this), resolveMethod, name, Expression.Call(typeof(NamedParameterOverloads), "FromIDictionary", null, parameters));
-
-                var resolveLambda = Expression.Lambda(resolveCall, name, parameters).Compile();
-
-                return resolveLambda;
-            }
-
-            throw new TinyIoCResolutionException(type);
-        }
-#endif
-        private object GetIEnumerableRequest(Type type)
-        {
-            // Using MakeGenericMethod (slow) because we need to
-            // cast the IEnumerable or constructing the type wil fail.
-            // We may as well use the ResolveAll<ResolveType> public
-            // method to do this.
-            var resolveAllMethod = this.GetType().GetMethod("ResolveAll", new Type[] { });
-            var genericResolveAllMethod = resolveAllMethod.MakeGenericMethod(type.GetGenericArguments()[0]);
-            return genericResolveAllMethod.Invoke(this, new object[] { });
-        }
-
-        private bool CanConstruct(ConstructorInfo ctor, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            if (parameters == null)
-                throw new ArgumentNullException("parameters");
-
-            foreach (var parameter in ctor.GetParameters())
-            {
-                if (string.IsNullOrEmpty(parameter.Name))
-                    return false;
-
-                var isParameterOverload = parameters.ContainsKey(parameter.Name);
-
-                if (parameter.ParameterType.IsPrimitive && !isParameterOverload)
-                    return false;
-
-                if (!isParameterOverload && !CanResolveInternal(new TypeRegistration(parameter.ParameterType), NamedParameterOverloads.Default, options))
-                    return false;
-            }
-
-            return true;
-        }
-
-        private ConstructorInfo GetBestConstructor(Type type, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            if (parameters == null)
-                throw new ArgumentNullException("parameters");
-
-            if (type.IsValueType)
-                return null;
-
-            // Get constructors in reverse order based on the number of parameters
-            // i.e. be as "greedy" as possible so we satify the most amount of dependencies possible
-            var ctors = from ctor in type.GetConstructors()
-                        orderby ctor.GetParameters().Count() descending
-                        select ctor;
-
-            foreach (var ctor in ctors)
-            {
-                if (CanConstruct(ctor, parameters, options))
-                    return ctor;
-            }
-
-            return null;
-        }
-
-        private object ConstructType(Type type, ResolveOptions options)
-        {
-            return ConstructType(type, null, NamedParameterOverloads.Default, options);
-        }
-
-        private object ConstructType(Type type, ConstructorInfo constructor, ResolveOptions options)
-        {
-            return ConstructType(type, constructor, NamedParameterOverloads.Default, options);
-        }
-
-        private object ConstructType(Type type, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            return ConstructType(type, null, parameters, options);
-        }
-
-        private object ConstructType(Type type, ConstructorInfo constructor, NamedParameterOverloads parameters, ResolveOptions options)
-        {
-            if (constructor == null)
-                constructor = GetBestConstructor(type, parameters, options);
-
-            if (constructor == null)
-                throw new TinyIoCResolutionException(type);
-
-            var ctorParams = constructor.GetParameters();
-            object[] args = new object[ctorParams.Count()];
-
-            for (int parameterIndex = 0; parameterIndex < ctorParams.Count(); parameterIndex++)
-            {
-                var currentParam = ctorParams[parameterIndex];
-
-                args[parameterIndex] = parameters.ContainsKey(currentParam.Name) ? parameters[currentParam.Name] : ResolveInternal(new TypeRegistration(currentParam.ParameterType), NamedParameterOverloads.Default, options);
-            }
-
-            try
-            {
-                return constructor.Invoke(args);
-            }
-            catch (Exception ex)
-            {
-                throw new TinyIoCResolutionException(type, ex);
-            }
-        }
-
-        private void BuildUpInternal(object input, ResolveOptions resolveOptions)
-        {
-            var properties = from property in input.GetType().GetProperties()
-                             where (property.GetGetMethod() != null) && (property.GetSetMethod() != null) && !property.PropertyType.IsValueType
-                             select property;
-
-            foreach (var property in properties)
-            {
-                if (property.GetValue(input, null) == null)
-                {
-                    try
-                    {
-                        property.SetValue(input, ResolveInternal(new TypeRegistration(property.PropertyType), NamedParameterOverloads.Default, resolveOptions), null);
-                    }
-                    catch (TinyIoCResolutionException)
-                    {
-                        // Catch any resolution errors and ignore them
-                    }
-                }
-            }
-        }
-
-        private IEnumerable<object> ResolveAllInternal(Type resolveType, bool includeUnnamed)
-        {
-            var registrations = _RegisteredTypes.Keys.Where(tr => tr.Type == resolveType);
-
-            if (!includeUnnamed)
-                registrations = registrations.Where(tr => tr.Name != string.Empty);
-
-            foreach (var registration in registrations)
-            {
-                yield return ResolveInternal(registration, NamedParameterOverloads.Default, ResolveOptions.Default);
-            }
-        }
-
-        private RegisterOptions ExecuteGenericRegister(Type[] genericParameterTypes, Type[] methodParameterTypes, object[] methodParameters)
-        {
-            try
-            {
-                var method = this.GetType().GetGenericMethod(BindingFlags.Instance | BindingFlags.Public, "Register", genericParameterTypes, methodParameterTypes);
-
-                return (RegisterOptions)method.Invoke(this, methodParameters);
-            }
-            catch (ArgumentException ex)
-            {
-                var registrationType = genericParameterTypes[0];
-                var implementationType = genericParameterTypes[1];
-
-                if (genericParameterTypes.Length == 2)
-                    implementationType = genericParameterTypes[2];
-
-                throw new TinyIoCRegistrationException(registrationType, implementationType, ex);
-            }
-        }
-        #endregion
-
-        #region IDisposable Members
-        bool disposed = false;
-        public void Dispose()
-        {
-            if (!disposed)
-            {
-                disposed = true;
-
-                _RegisteredTypes.Dispose();
-
-                GC.SuppressFinalize(this);
-            }
-        }
-
-        #endregion
-    }
-}
diff --git a/MonoStockPortfolio/MonoStockPortfolio.csproj b/MonoStockPortfolio/MonoStockPortfolio.csproj
index b8229dd..0b4ebe2 100644
--- a/MonoStockPortfolio/MonoStockPortfolio.csproj
+++ b/MonoStockPortfolio/MonoStockPortfolio.csproj
@@ -40,7 +40,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="PostSharp.SL, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\libs\PostSharp.SL.dll</HintPath>
+      <HintPath>..\..\..\Program Files (x86)\PostSharp 2.0\Reference Assemblies\Silverlight 3.0\PostSharp.SL.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -48,6 +48,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Activites\ConfigActivity.cs" />
     <Compile Include="Activites\EditPositionActivity.designer.cs">
       <DependentUpon>EditPositionActivity.cs</DependentUpon>
     </Compile>
@@ -58,7 +59,6 @@
     <Compile Include="Framework\ActivityExtensions.cs" />
     <Compile Include="Framework\ContextExtensions.cs" />
     <Compile Include="Framework\GenericArrayAdapter.cs" />
-    <Compile Include="Framework\IoCAttribute.cs" />
     <Compile Include="Activites\MainActivity.designer.cs">
       <DependentUpon>MainActivity.cs</DependentUpon>
     </Compile>
@@ -68,17 +68,16 @@
     <Compile Include="Activites\PortfolioActivity.designer.cs">
       <DependentUpon>PortfolioActivity.cs</DependentUpon>
     </Compile>
+    <Compile Include="Framework\IoCAttribute.cs" />
+    <Compile Include="Framework\IttyBittyIoC.cs" />
     <Compile Include="Framework\ServiceLocator.cs" />
-    <Compile Include="Framework\TinyIoC.cs" />
     <Compile Include="Resources\Resource.Designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Framework\StringExtensions.cs" />
     <Compile Include="Framework\FormValidator.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="PostSharp.Custom.targets">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="PostSharp.Custom.targets" />
     <None Include="Resources\AboutResources.txt" />
   </ItemGroup>
   <ItemGroup>
@@ -117,15 +116,27 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\config.xml" />
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\ic_menu_refresh.png" />
+  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
-    <AndroidResource Include="Resources\drawable-ldpi\icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-mdpi\ic_menu_refresh.png" />
+  </ItemGroup>
+  <ItemGroup>
     <AndroidResource Include="Resources\drawable-mdpi\icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\ic_menu_refresh.png" />
     <AndroidResource Include="Resources\drawable-ldpi\ic_menu_refresh.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\ic_menu_refresh.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-ldpi\icon.png" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/MonoStockPortfolio/Resources/Resource.Designer.cs b/MonoStockPortfolio/Resources/Resource.Designer.cs
index 3c6bea7..d1fb061 100644
--- a/MonoStockPortfolio/Resources/Resource.Designer.cs
+++ b/MonoStockPortfolio/Resources/Resource.Designer.cs
@@ -15,15 +15,15 @@ namespace MonoStockPortfolio
 	public partial class Resource
 	{
 		
-		public partial class attr
+		public partial class Attribute
 		{
 			
-			private attr()
+			private Attribute()
 			{
 			}
 		}
 		
-		public partial class drawable
+		public partial class Drawable
 		{
 			
 			// aapt resource value: 0x7f020000
@@ -32,12 +32,12 @@ namespace MonoStockPortfolio
 			// aapt resource value: 0x7f020001
 			public const int icon = 2130837505;
 			
-			private drawable()
+			private Drawable()
 			{
 			}
 		}
 		
-		public partial class id
+		public partial class Id
 		{
 			
 			// aapt resource value: 0x7f050004
@@ -73,12 +73,12 @@ namespace MonoStockPortfolio
 			// aapt resource value: 0x7f05000a
 			public const int quoteListview = 2131034122;
 			
-			private id()
+			private Id()
 			{
 			}
 		}
 		
-		public partial class layout
+		public partial class Layout
 		{
 			
 			// aapt resource value: 0x7f030000
@@ -88,17 +88,20 @@ namespace MonoStockPortfolio
 			public const int addposition = 2130903041;
 			
 			// aapt resource value: 0x7f030002
-			public const int main = 2130903042;
+			public const int config = 2130903042;
 			
 			// aapt resource value: 0x7f030003
-			public const int portfolio = 2130903043;
+			public const int main = 2130903043;
 			
-			private layout()
+			// aapt resource value: 0x7f030004
+			public const int portfolio = 2130903044;
+			
+			private Layout()
 			{
 			}
 		}
 		
-		public partial class @string
+		public partial class String
 		{
 			
 			// aapt resource value: 0x7f040001
@@ -107,7 +110,7 @@ namespace MonoStockPortfolio
 			// aapt resource value: 0x7f040000
 			public const int hello = 2130968576;
 			
-			private @string()
+			private String()
 			{
 			}
 		}
diff --git a/MonoStockPortfolio/Resources/layout/config.xml b/MonoStockPortfolio/Resources/layout/config.xml
new file mode 100644
index 0000000..1962c28
--- /dev/null
+++ b/MonoStockPortfolio/Resources/layout/config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="General Settings">
+        <Preference
+                android:title="Stock Items"
+                android:summary="Which columns do you want to see?"
+                android:key="customStockItems" />
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/MonoStockPortfolio/Resources/layout/main.xml b/MonoStockPortfolio/Resources/layout/main.xml
index e78f827..486851b 100644
--- a/MonoStockPortfolio/Resources/layout/main.xml
+++ b/MonoStockPortfolio/Resources/layout/main.xml
@@ -4,16 +4,11 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
 
-    <LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent" android:orientation="vertical">
+    <Button android:text="Add New Portfolio" android:layout_height="wrap_content"
+        android:layout_width="fill_parent" android:id="@+id/btnAddPortfolio" />
 
-        <Button android:text="Add New Portfolio" android:layout_height="wrap_content"
-            android:layout_width="fill_parent" android:id="@+id/btnAddPortfolio" />
-
-        <ListView android:id="@+id/portfolioList"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content" />
-
-    </LinearLayout>
+    <ListView android:id="@+id/portfolioList"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/libs/xunit.dll b/libs/xunit.dll
new file mode 100644
index 0000000..423fbbc
Binary files /dev/null and b/libs/xunit.dll differ