Everything builds :D

18 files changed, 600 insertions, 135 deletions

diff --git a/DNSwift/DNSwift.xcodeproj/project.pbxproj b/DNSwift/DNSwift.xcodeproj/project.pbxproj
index d3eabe5..bc7ded1 100644
--- a/DNSwift/DNSwift.xcodeproj/project.pbxproj
+++ b/DNSwift/DNSwift.xcodeproj/project.pbxproj
@@ -11,19 +11,8 @@
 		C98EBA541986F0EF00DCC6C9 /* DNSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C98EBA481986F0EF00DCC6C9 /* DNSwift.framework */; };
 		C98EBA651986F10900DCC6C9 /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98EBA641986F10900DCC6C9 /* StringExtensions.swift */; };
 		C98EBA671986F1B800DCC6C9 /* StringExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98EBA661986F1B800DCC6C9 /* StringExtensionTests.swift */; };
-		C98EBA681986F47D00DCC6C9 /* StringExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98EBA641986F10900DCC6C9 /* StringExtensions.swift */; };
 		C98EBA6A1986FAA600DCC6C9 /* ArrayExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98EBA691986FAA600DCC6C9 /* ArrayExtensions.swift */; };
-		C98EBA6B1986FAA600DCC6C9 /* ArrayExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98EBA691986FAA600DCC6C9 /* ArrayExtensions.swift */; };
 		C98EBA6E1987150600DCC6C9 /* ArrayExtensionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C98EBA6C1987150600DCC6C9 /* ArrayExtensionTests.swift */; };
-		C9D515B319871D0900B48496 /* CharExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515B219871D0900B48496 /* CharExtensions.swift */; };
-		C9D515B919871D8500B48496 /* IEnumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515B819871D8500B48496 /* IEnumerator.swift */; };
-		C9D515BB19871D9200B48496 /* IEnumerable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515BA19871D9200B48496 /* IEnumerable.swift */; };
-		C9D515BD19871DB900B48496 /* IList.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515BC19871DB900B48496 /* IList.swift */; };
-		C9D515BF19871DEB00B48496 /* ICollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515BE19871DEB00B48496 /* ICollection.swift */; };
-		C9D515C119871E2400B48496 /* Enumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515C019871E2400B48496 /* Enumerator.swift */; };
-		C9D515C319871F3500B48496 /* Enumerable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515C219871F3500B48496 /* Enumerable.swift */; };
-		C9D515C519871FC700B48496 /* Collection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515C419871FC700B48496 /* Collection.swift */; };
-		C9D515C7198720B900B48496 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9D515C6198720B900B48496 /* List.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,15 +35,6 @@
 		C98EBA661986F1B800DCC6C9 /* StringExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = StringExtensionTests.swift; path = /Users/matt/Repos/DNSwift/DNSwift/DNSwiftTests/StringExtensionTests.swift; sourceTree = "<absolute>"; };
 		C98EBA691986FAA600DCC6C9 /* ArrayExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExtensions.swift; path = /Users/matt/Repos/DNSwift/DNSwift/DNSwift/ArrayExtensions.swift; sourceTree = "<absolute>"; };
 		C98EBA6C1987150600DCC6C9 /* ArrayExtensionTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ArrayExtensionTests.swift; path = /Users/matt/Repos/DNSwift/DNSwift/DNSwiftTests/ArrayExtensionTests.swift; sourceTree = "<absolute>"; };
-		C9D515B219871D0900B48496 /* CharExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CharExtensions.swift; sourceTree = "<group>"; };
-		C9D515B819871D8500B48496 /* IEnumerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IEnumerator.swift; sourceTree = "<group>"; };
-		C9D515BA19871D9200B48496 /* IEnumerable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IEnumerable.swift; sourceTree = "<group>"; };
-		C9D515BC19871DB900B48496 /* IList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IList.swift; sourceTree = "<group>"; };
-		C9D515BE19871DEB00B48496 /* ICollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICollection.swift; sourceTree = "<group>"; };
-		C9D515C019871E2400B48496 /* Enumerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerator.swift; sourceTree = "<group>"; };
-		C9D515C219871F3500B48496 /* Enumerable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerable.swift; sourceTree = "<group>"; };
-		C9D515C419871FC700B48496 /* Collection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Collection.swift; sourceTree = "<group>"; };
-		C9D515C6198720B900B48496 /* List.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -97,12 +77,10 @@
 		C98EBA4A1986F0EF00DCC6C9 /* DNSwift */ = {
 			isa = PBXGroup;
 			children = (
-				C9D515AF19871CCD00B48496 /* System */,
 				C98EBA4D1986F0EF00DCC6C9 /* DNSwift.h */,
 				C98EBA4B1986F0EF00DCC6C9 /* Supporting Files */,
 				C98EBA641986F10900DCC6C9 /* StringExtensions.swift */,
 				C98EBA691986FAA600DCC6C9 /* ArrayExtensions.swift */,
-				C9D515B219871D0900B48496 /* CharExtensions.swift */,
 			);
 			name = DNSwift;
 			path = /Users/matt/Repos/DNSwift/DNSwift/DNSwift;
@@ -137,40 +115,6 @@
 			path = "/Users/matt/Repos/DNSwift/DNSwift/DNSwiftTests/Supporting Files";
 			sourceTree = "<absolute>";
 		};
-		C9D515AF19871CCD00B48496 /* System */ = {
-			isa = PBXGroup;
-			children = (
-				C9D515B419871D4A00B48496 /* Collections */,
-			);
-			name = System;
-			path = /Users/matt/Repos/DNSwift/DNSwift/DNSwift/System;
-			sourceTree = "<absolute>";
-		};
-		C9D515B419871D4A00B48496 /* Collections */ = {
-			isa = PBXGroup;
-			children = (
-				C9D515B519871D5C00B48496 /* Generic */,
-			);
-			name = Collections;
-			path = /Users/matt/Repos/DNSwift/DNSwift/DNSwift/System/Collections;
-			sourceTree = "<absolute>";
-		};
-		C9D515B519871D5C00B48496 /* Generic */ = {
-			isa = PBXGroup;
-			children = (
-				C9D515B819871D8500B48496 /* IEnumerator.swift */,
-				C9D515C019871E2400B48496 /* Enumerator.swift */,
-				C9D515BA19871D9200B48496 /* IEnumerable.swift */,
-				C9D515C219871F3500B48496 /* Enumerable.swift */,
-				C9D515BE19871DEB00B48496 /* ICollection.swift */,
-				C9D515C419871FC700B48496 /* Collection.swift */,
-				C9D515BC19871DB900B48496 /* IList.swift */,
-				C9D515C6198720B900B48496 /* List.swift */,
-			);
-			name = Generic;
-			path = /Users/matt/Repos/DNSwift/DNSwift/DNSwift/System/Collections/Generic;
-			sourceTree = "<absolute>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -279,17 +223,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C9D515BF19871DEB00B48496 /* ICollection.swift in Sources */,
 				C98EBA651986F10900DCC6C9 /* StringExtensions.swift in Sources */,
-				C9D515B919871D8500B48496 /* IEnumerator.swift in Sources */,
-				C9D515C519871FC700B48496 /* Collection.swift in Sources */,
-				C9D515C7198720B900B48496 /* List.swift in Sources */,
-				C9D515B319871D0900B48496 /* CharExtensions.swift in Sources */,
-				C9D515BD19871DB900B48496 /* IList.swift in Sources */,
-				C9D515C119871E2400B48496 /* Enumerator.swift in Sources */,
-				C9D515C319871F3500B48496 /* Enumerable.swift in Sources */,
 				C98EBA6A1986FAA600DCC6C9 /* ArrayExtensions.swift in Sources */,
-				C9D515BB19871D9200B48496 /* IEnumerable.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -297,8 +232,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				C98EBA681986F47D00DCC6C9 /* StringExtensions.swift in Sources */,
-				C98EBA6B1986FAA600DCC6C9 /* ArrayExtensions.swift in Sources */,
 				C98EBA671986F1B800DCC6C9 /* StringExtensionTests.swift in Sources */,
 				C98EBA6E1987150600DCC6C9 /* ArrayExtensionTests.swift in Sources */,
 			);
diff --git a/DNSwift/DNSwift/ArrayExtensions.swift b/DNSwift/DNSwift/ArrayExtensions.swift
index ccf7be0..9ea00a4 100644
--- a/DNSwift/DNSwift/ArrayExtensions.swift
+++ b/DNSwift/DNSwift/ArrayExtensions.swift
@@ -7,9 +7,8 @@
 //
 
 //import Foundation
-import DNSwift
 
-public extension Array {// : IEnumerable {
+public extension Array {
     public func IndexOf<T: Equatable>(item: T) -> Int {
         //looks like this is the best way to do it - http://stackoverflow.com/questions/24028860/how-to-find-index-of-list-item-in-apples-swift/24029119#24029119
         
@@ -22,26 +21,14 @@ public extension Array {// : IEnumerable {
         return -1;
     }
     
-    /*func GetEnumerator<IE:IEnumerator>() -> IE {
-        return Enumerator(objs: self) as IE;
-    }*/
-    
     public func Any() -> Bool {
         return self.count > 0;
     }
     
-    /*func Any(predicate: (T) -> Bool) {
-    return self.Count(predicate) as Int > 0;
-    }*/
-    
     public func Count() -> Int {
         return self.count;
     }
     
-    public func Count(predicate: (T) -> Bool) -> Int {
-        return self.Where(predicate).Count();
-    }
-    
     public func Where(predicate: (T) -> Bool) -> Array<T> {
         return self.filter(predicate);
     }
@@ -50,10 +37,6 @@ public extension Array {// : IEnumerable {
         return self[0];
     }
     
-    public func First(predicate: (T) -> Bool) -> T {
-        return self.filter(predicate)[0];
-    }
-    
     public func FirstOrDefault() -> T? {
         if (self.count > 0) {
             return self[0];
@@ -63,6 +46,10 @@ public extension Array {// : IEnumerable {
         }
     }
     
+    public func First(predicate: (T) -> Bool) -> T {
+        return self.filter(predicate)[0];
+    }
+    
     public func FirstOrDefault(predicate: (T) -> Bool) -> T? {
         var found = self.filter(predicate);
         if(found.count > 0)
@@ -74,8 +61,18 @@ public extension Array {// : IEnumerable {
             return nil;
         }
     }
+}
+
+/*public extension Array {// : IEnumerable {
+    /*func GetEnumerator<IE:IEnumerator>() -> IE {
+        return Enumerator(objs: self) as IE;
+    }*/
+    
+    /*func Any(predicate: (T) -> Bool) {
+    return self.Count(predicate) as Int > 0;
+    }*/
     
     //public func ToList() -> List<T> {
         //return List(objs: self);
     //}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/DNSwift/DNSwift/CharExtensions.swift b/DNSwift/DNSwift/CharExtensions.swift
deleted file mode 100644
index 4806a2e..0000000
--- a/DNSwift/DNSwift/CharExtensions.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  char.swift
-//  DNSwift
-//
-//  Created by Matthew S on 6/6/14.
-//  Copyright (c) 2014 Matthew S. All rights reserved.
-//
-
-import Foundation
-
-public extension Character {
-    
-}
diff --git a/DNSwift/DNSwift/System/Collections/Generic/Collection.swift b/DNSwift/DNSwift/System/Collections/Generic/Collection.swift
deleted file mode 100644
index ca32443..0000000
--- a/DNSwift/DNSwift/System/Collections/Generic/Collection.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-//  Collection.swift
-//  DNSwift
-//
-//  Created by Matthew S on 7/28/14.
-//  Copyright (c) 2014 Matthew S. All rights reserved.
-//
-
-import Foundation
-
-//TODO: implement Collection
\ No newline at end of file
diff --git a/DNSwift/DNSwiftTests/ArrayExtensionTests.swift b/DNSwift/DNSwiftTests/ArrayExtensionTests.swift
index f07cd59..907cd76 100644
--- a/DNSwift/DNSwiftTests/ArrayExtensionTests.swift
+++ b/DNSwift/DNSwiftTests/ArrayExtensionTests.swift
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Matthew S. All rights reserved.
 //
 
-import DNSwift;
+//import DNSwift;
 import XCTest;
 
 class ArrayExtensionTests: XCTestCase {
@@ -36,7 +36,7 @@ class ArrayExtensionTests: XCTestCase {
     func testArrayCount() {
         XCTAssertEqual(arr.Count(), 4);
     }
-    
+    /*
     func testArrayCountWithPredicate() {
         XCTAssertEqual(arr.Count({ item in item == "one" || item == "two" }), 2);
     }
@@ -66,5 +66,5 @@ class ArrayExtensionTests: XCTestCase {
         
         var emptyArr: [String] = [];
         XCTAssertNil(arr.FirstOrDefault({ item in !item.Contains("o") && !item.Contains("e") }));
-    }
+    }*/
 }
\ No newline at end of file
diff --git a/System.Collections.Generic/System.Collections.Generic.xcodeproj/project.pbxproj b/System.Collections.Generic/System.Collections.Generic.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..5071967
--- /dev/null
+++ b/System.Collections.Generic/System.Collections.Generic.xcodeproj/project.pbxproj
@@ -0,0 +1,454 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		C901392A198DCE3900D6EE29 /* System.Collections.Generic.h in Headers */ = {isa = PBXBuildFile; fileRef = C9013929198DCE3900D6EE29 /* System.Collections.Generic.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C9013930198DCE3900D6EE29 /* System.Collections.Generic.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9013924198DCE3900D6EE29 /* System.Collections.Generic.framework */; };
+		C9013937198DCE3900D6EE29 /* System_Collections_GenericTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9013936198DCE3900D6EE29 /* System_Collections_GenericTests.swift */; };
+		C9013941198DCE5100D6EE29 /* DNSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C9013940198DCE5100D6EE29 /* DNSwift.framework */; };
+		C9013945198DCEAB00D6EE29 /* IEnumerable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9013944198DCEAB00D6EE29 /* IEnumerable.swift */; };
+		C9013947198DCECA00D6EE29 /* IEnumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9013946198DCECA00D6EE29 /* IEnumerator.swift */; };
+		C9013949198DD05700D6EE29 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9013948198DD05700D6EE29 /* List.swift */; };
+		C901394D198DD15100D6EE29 /* ICollection.swift in Sources */ = {isa = PBXBuildFile; fileRef = C901394C198DD15100D6EE29 /* ICollection.swift */; };
+		C901394F198DD17300D6EE29 /* IList.swift in Sources */ = {isa = PBXBuildFile; fileRef = C901394E198DD17300D6EE29 /* IList.swift */; };
+		C9013951198DD1C700D6EE29 /* Enumerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9013950198DD1C700D6EE29 /* Enumerator.swift */; };
+		C9013953198DD21700D6EE29 /* Enumerable.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9013952198DD21700D6EE29 /* Enumerable.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		C9013931198DCE3900D6EE29 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = C901391B198DCE3900D6EE29 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = C9013923198DCE3900D6EE29;
+			remoteInfo = System.Collections.Generic;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		C9013924198DCE3900D6EE29 /* System.Collections.Generic.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = System.Collections.Generic.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		C9013928198DCE3900D6EE29 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C9013929198DCE3900D6EE29 /* System.Collections.Generic.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = System.Collections.Generic.h; sourceTree = "<group>"; };
+		C901392F198DCE3900D6EE29 /* System.Collections.GenericTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = System.Collections.GenericTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		C9013935198DCE3900D6EE29 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C9013936198DCE3900D6EE29 /* System_Collections_GenericTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = System_Collections_GenericTests.swift; sourceTree = "<group>"; };
+		C9013940198DCE5100D6EE29 /* DNSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DNSwift.framework; path = "../DNSwift/DerivedData/DNSwift/Build/Products/Debug-iphonesimulator/DNSwift.framework"; sourceTree = "<group>"; };
+		C9013944198DCEAB00D6EE29 /* IEnumerable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IEnumerable.swift; sourceTree = "<group>"; };
+		C9013946198DCECA00D6EE29 /* IEnumerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IEnumerator.swift; sourceTree = "<group>"; };
+		C9013948198DD05700D6EE29 /* List.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		C901394C198DD15100D6EE29 /* ICollection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICollection.swift; sourceTree = "<group>"; };
+		C901394E198DD17300D6EE29 /* IList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IList.swift; sourceTree = "<group>"; };
+		C9013950198DD1C700D6EE29 /* Enumerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerator.swift; sourceTree = "<group>"; };
+		C9013952198DD21700D6EE29 /* Enumerable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Enumerable.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		C9013920198DCE3900D6EE29 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C9013941198DCE5100D6EE29 /* DNSwift.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C901392C198DCE3900D6EE29 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C9013930198DCE3900D6EE29 /* System.Collections.Generic.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		C901391A198DCE3900D6EE29 = {
+			isa = PBXGroup;
+			children = (
+				C9013940198DCE5100D6EE29 /* DNSwift.framework */,
+				C9013926198DCE3900D6EE29 /* System.Collections.Generic */,
+				C9013933198DCE3900D6EE29 /* System.Collections.GenericTests */,
+				C9013925198DCE3900D6EE29 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		C9013925198DCE3900D6EE29 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				C9013924198DCE3900D6EE29 /* System.Collections.Generic.framework */,
+				C901392F198DCE3900D6EE29 /* System.Collections.GenericTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		C9013926198DCE3900D6EE29 /* System.Collections.Generic */ = {
+			isa = PBXGroup;
+			children = (
+				C9013929198DCE3900D6EE29 /* System.Collections.Generic.h */,
+				C9013927198DCE3900D6EE29 /* Supporting Files */,
+				C9013944198DCEAB00D6EE29 /* IEnumerable.swift */,
+				C9013946198DCECA00D6EE29 /* IEnumerator.swift */,
+				C9013948198DD05700D6EE29 /* List.swift */,
+				C901394C198DD15100D6EE29 /* ICollection.swift */,
+				C901394E198DD17300D6EE29 /* IList.swift */,
+				C9013950198DD1C700D6EE29 /* Enumerator.swift */,
+				C9013952198DD21700D6EE29 /* Enumerable.swift */,
+			);
+			path = System.Collections.Generic;
+			sourceTree = "<group>";
+		};
+		C9013927198DCE3900D6EE29 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				C9013928198DCE3900D6EE29 /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		C9013933198DCE3900D6EE29 /* System.Collections.GenericTests */ = {
+			isa = PBXGroup;
+			children = (
+				C9013936198DCE3900D6EE29 /* System_Collections_GenericTests.swift */,
+				C9013934198DCE3900D6EE29 /* Supporting Files */,
+			);
+			path = System.Collections.GenericTests;
+			sourceTree = "<group>";
+		};
+		C9013934198DCE3900D6EE29 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				C9013935198DCE3900D6EE29 /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		C9013921198DCE3900D6EE29 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C901392A198DCE3900D6EE29 /* System.Collections.Generic.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		C9013923198DCE3900D6EE29 /* System.Collections.Generic */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C901393A198DCE3900D6EE29 /* Build configuration list for PBXNativeTarget "System.Collections.Generic" */;
+			buildPhases = (
+				C901391F198DCE3900D6EE29 /* Sources */,
+				C9013920198DCE3900D6EE29 /* Frameworks */,
+				C9013921198DCE3900D6EE29 /* Headers */,
+				C9013922198DCE3900D6EE29 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = System.Collections.Generic;
+			productName = System.Collections.Generic;
+			productReference = C9013924198DCE3900D6EE29 /* System.Collections.Generic.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		C901392E198DCE3900D6EE29 /* System.Collections.GenericTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C901393D198DCE3900D6EE29 /* Build configuration list for PBXNativeTarget "System.Collections.GenericTests" */;
+			buildPhases = (
+				C901392B198DCE3900D6EE29 /* Sources */,
+				C901392C198DCE3900D6EE29 /* Frameworks */,
+				C901392D198DCE3900D6EE29 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				C9013932198DCE3900D6EE29 /* PBXTargetDependency */,
+			);
+			name = System.Collections.GenericTests;
+			productName = System.Collections.GenericTests;
+			productReference = C901392F198DCE3900D6EE29 /* System.Collections.GenericTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		C901391B198DCE3900D6EE29 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0600;
+				ORGANIZATIONNAME = "Matthew S";
+				TargetAttributes = {
+					C9013923198DCE3900D6EE29 = {
+						CreatedOnToolsVersion = 6.0;
+					};
+					C901392E198DCE3900D6EE29 = {
+						CreatedOnToolsVersion = 6.0;
+						TestTargetID = C9013923198DCE3900D6EE29;
+					};
+				};
+			};
+			buildConfigurationList = C901391E198DCE3900D6EE29 /* Build configuration list for PBXProject "System.Collections.Generic" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = C901391A198DCE3900D6EE29;
+			productRefGroup = C9013925198DCE3900D6EE29 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C9013923198DCE3900D6EE29 /* System.Collections.Generic */,
+				C901392E198DCE3900D6EE29 /* System.Collections.GenericTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		C9013922198DCE3900D6EE29 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C901392D198DCE3900D6EE29 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		C901391F198DCE3900D6EE29 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C9013945198DCEAB00D6EE29 /* IEnumerable.swift in Sources */,
+				C901394D198DD15100D6EE29 /* ICollection.swift in Sources */,
+				C9013947198DCECA00D6EE29 /* IEnumerator.swift in Sources */,
+				C901394F198DD17300D6EE29 /* IList.swift in Sources */,
+				C9013949198DD05700D6EE29 /* List.swift in Sources */,
+				C9013951198DD1C700D6EE29 /* Enumerator.swift in Sources */,
+				C9013953198DD21700D6EE29 /* Enumerable.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		C901392B198DCE3900D6EE29 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				C9013937198DCE3900D6EE29 /* System_Collections_GenericTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		C9013932198DCE3900D6EE29 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = C9013923198DCE3900D6EE29 /* System.Collections.Generic */;
+			targetProxy = C9013931198DCE3900D6EE29 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		C9013938198DCE3900D6EE29 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				CURRENT_PROJECT_VERSION = 1;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Debug;
+		};
+		C9013939198DCE3900D6EE29 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				CURRENT_PROJECT_VERSION = 1;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = iphoneos;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				VERSIONING_SYSTEM = "apple-generic";
+				VERSION_INFO_PREFIX = "";
+			};
+			name = Release;
+		};
+		C901393B198DCE3900D6EE29 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"/Users/matt/Repos/DNSwift/DNSwift/DerivedData/DNSwift/Build/Products/Debug-iphonesimulator",
+				);
+				INFOPLIST_FILE = System.Collections.Generic/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		C901393C198DCE3900D6EE29 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"/Users/matt/Repos/DNSwift/DNSwift/DerivedData/DNSwift/Build/Products/Debug-iphonesimulator",
+				);
+				INFOPLIST_FILE = System.Collections.Generic/Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SKIP_INSTALL = YES;
+			};
+			name = Release;
+		};
+		C901393E198DCE3900D6EE29 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = System.Collections.GenericTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		C901393F198DCE3900D6EE29 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = System.Collections.GenericTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C901391E198DCE3900D6EE29 /* Build configuration list for PBXProject "System.Collections.Generic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C9013938198DCE3900D6EE29 /* Debug */,
+				C9013939198DCE3900D6EE29 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C901393A198DCE3900D6EE29 /* Build configuration list for PBXNativeTarget "System.Collections.Generic" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C901393B198DCE3900D6EE29 /* Debug */,
+				C901393C198DCE3900D6EE29 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+		C901393D198DCE3900D6EE29 /* Build configuration list for PBXNativeTarget "System.Collections.GenericTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C901393E198DCE3900D6EE29 /* Debug */,
+				C901393F198DCE3900D6EE29 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = C901391B198DCE3900D6EE29 /* Project object */;
+}
diff --git a/System.Collections.Generic/System.Collections.Generic.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/System.Collections.Generic/System.Collections.Generic.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..dfd5ec4
--- /dev/null
+++ b/System.Collections.Generic/System.Collections.Generic.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:System.Collections.Generic.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/DNSwift/DNSwift/System/Collections/Generic/Enumerable.swift b/System.Collections.Generic/System.Collections.Generic/Enumerable.swift
index 08054ee..08054ee 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/Enumerable.swift
+++ b/System.Collections.Generic/System.Collections.Generic/Enumerable.swift
diff --git a/DNSwift/DNSwift/System/Collections/Generic/Enumerator.swift b/System.Collections.Generic/System.Collections.Generic/Enumerator.swift
index 5174e27..b5f8c91 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/Enumerator.swift
+++ b/System.Collections.Generic/System.Collections.Generic/Enumerator.swift
@@ -10,9 +10,9 @@ import Foundation
 
 public class Enumerator<T> : IEnumerator {
     public var Current: T {
-        get {
-            return Objects[CurrentIndex];
-        }
+    get {
+        return Objects[CurrentIndex];
+    }
     }
     
     public var CurrentIndex = 0;
diff --git a/DNSwift/DNSwift/System/Collections/Generic/ICollection.swift b/System.Collections.Generic/System.Collections.Generic/ICollection.swift
index 67a4ee8..eb892d5 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/ICollection.swift
+++ b/System.Collections.Generic/System.Collections.Generic/ICollection.swift
@@ -1,11 +1,3 @@
-//
-//  ICollection.swift
-//  DNSwift
-//
-//  Created by Matthew S on 7/28/14.
-//  Copyright (c) 2014 Matthew S. All rights reserved.
-//
-
 import Foundation
 
 //http://msdn.microsoft.com/en-us/library/92t2ye13%28v=vs.110%29.aspx
diff --git a/DNSwift/DNSwift/System/Collections/Generic/IEnumerable.swift b/System.Collections.Generic/System.Collections.Generic/IEnumerable.swift
index 35db353..35db353 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/IEnumerable.swift
+++ b/System.Collections.Generic/System.Collections.Generic/IEnumerable.swift
diff --git a/DNSwift/DNSwift/System/Collections/Generic/IEnumerator.swift b/System.Collections.Generic/System.Collections.Generic/IEnumerator.swift
index 8cc5dd1..8cc5dd1 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/IEnumerator.swift
+++ b/System.Collections.Generic/System.Collections.Generic/IEnumerator.swift
diff --git a/DNSwift/DNSwift/System/Collections/Generic/IList.swift b/System.Collections.Generic/System.Collections.Generic/IList.swift
index 990da26..990da26 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/IList.swift
+++ b/System.Collections.Generic/System.Collections.Generic/IList.swift
diff --git a/System.Collections.Generic/System.Collections.Generic/Info.plist b/System.Collections.Generic/System.Collections.Generic/Info.plist
new file mode 100644
index 0000000..d589e23
--- /dev/null
+++ b/System.Collections.Generic/System.Collections.Generic/Info.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>SharpSwift.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/DNSwift/DNSwift/System/Collections/Generic/List.swift b/System.Collections.Generic/System.Collections.Generic/List.swift
index 2d1d8b9..3630462 100644
--- a/DNSwift/DNSwift/System/Collections/Generic/List.swift
+++ b/System.Collections.Generic/System.Collections.Generic/List.swift
@@ -1,4 +1,5 @@
 import Foundation
+import DNSwift
 
 public class List<E where E:Equatable>: IList {
     typealias T = E;
@@ -6,9 +7,9 @@ public class List<E where E:Equatable>: IList {
     private var Objects: [T];
     
     public var Count: Int {
-        get {
-            return Objects.count
-        }
+    get {
+        return Objects.count
+    }
     };
     public var Capacity: Int; //todo: consider implementing this
     
@@ -22,7 +23,7 @@ public class List<E where E:Equatable>: IList {
         Capacity = Int.max;
         self.Objects = objs;
     }
-
+    
     //IEnumerable
     public func GetEnumerator<IE where IE:IEnumerator>() -> IE {
         return Enumerator(objs: Objects) as IE;
@@ -229,14 +230,14 @@ public class List<E where E:Equatable>: IList {
     
     //TrimExcess
     
-    public func TrueForAll(predicate: (T) -> Bool) -> Bool {
+    /*public func TrueForAll(predicate: (T) -> Bool) -> Bool {
         return self.Where(predicate).Count == self.Count;
-    }
+    }*/
     
     //Extension methods
     
     public func Where(predicate: (T) -> Bool) -> List<T> {
-        return List(objs: self.Objects.Where(predicate));
+        return List(objs: self.Objects.filter(predicate));
     }
     
     public func Last() -> T { //TODO nil check/count == 0
@@ -252,18 +253,18 @@ public class List<E where E:Equatable>: IList {
     }
     
     public func First() -> T {
-        return self.Objects.First();
+        return self.Objects[0];
     }
     
     public func First(predicate: (T) -> Bool) -> T {
-        return self.Objects.First(predicate);
+        return self.Where(predicate).First();
     }
     
-    public func FirstOrDefault() -> T? {
+    /*public func FirstOrDefault() -> T? {
         return self.Objects.FirstOrDefault();
     }
     
     public func FirstOrDefault(predicate: (T) -> Bool) -> T? {
         return self.Objects.FirstOrDefault(predicate);
-    }
+    }*/
 }
\ No newline at end of file
diff --git a/System.Collections.Generic/System.Collections.Generic/System.Collections.Generic.h b/System.Collections.Generic/System.Collections.Generic/System.Collections.Generic.h
new file mode 100644
index 0000000..facdb78
--- /dev/null
+++ b/System.Collections.Generic/System.Collections.Generic/System.Collections.Generic.h
@@ -0,0 +1,19 @@
+//
+//  System.Collections.Generic.h
+//  System.Collections.Generic
+//
+//  Created by Matthew S on 8/2/14.
+//  Copyright (c) 2014 Matthew S. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for System.Collections.Generic.
+FOUNDATION_EXPORT double System_Collections_GenericVersionNumber;
+
+//! Project version string for System.Collections.Generic.
+FOUNDATION_EXPORT const unsigned char System_Collections_GenericVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <System_Collections_Generic/PublicHeader.h>
+
+
diff --git a/System.Collections.Generic/System.Collections.GenericTests/Info.plist b/System.Collections.Generic/System.Collections.GenericTests/Info.plist
new file mode 100644
index 0000000..d126ae6
--- /dev/null
+++ b/System.Collections.Generic/System.Collections.GenericTests/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>SharpSwift.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/System.Collections.Generic/System.Collections.GenericTests/System_Collections_GenericTests.swift b/System.Collections.Generic/System.Collections.GenericTests/System_Collections_GenericTests.swift
new file mode 100644
index 0000000..e9c13b2
--- /dev/null
+++ b/System.Collections.Generic/System.Collections.GenericTests/System_Collections_GenericTests.swift
@@ -0,0 +1,36 @@
+//
+//  System_Collections_GenericTests.swift
+//  System.Collections.GenericTests
+//
+//  Created by Matthew S on 8/2/14.
+//  Copyright (c) 2014 Matthew S. All rights reserved.
+//
+
+import UIKit
+import XCTest
+
+class System_Collections_GenericTests: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func testExample() {
+        // This is an example of a functional test case.
+        XCTAssert(true, "Pass")
+    }
+    
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measureBlock() {
+            // Put the code you want to measure the time of here.
+        }
+    }
+    
+}