diff --git a/app/src/main/java/vanderclay/comet/benson/franticsearch/data/API/MtgAPI.kt b/app/src/main/java/vanderclay/comet/benson/franticsearch/data/API/MtgAPI.kt
@@ -0,0 +1,114 @@
+package vanderclay.comet.benson.franticsearch.data.API
+
+import io.magicthegathering.javasdk.api.CardAPI
+import io.magicthegathering.javasdk.api.SetAPI
+import io.magicthegathering.javasdk.resource.Card
+import io.magicthegathering.javasdk.resource.MtgSet
+import org.joda.time.DateTime
+import vanderclay.comet.benson.franticsearch.commons.convertStringToDateTime
+
+class MtgAPI {
+
+    companion object {
+        /**
+         *
+         *
+         *  CARD API CALLS
+         *
+         *  - All api calls that are related to cards
+         *
+         *
+         */
+
+        fun getCards(vararg extraFilters: String): List<Card> {
+            val cardList = mutableListOf<Card>()
+            var page = 1
+            val filters = arrayListOf("page=$page", *extraFilters)
+            var cardsReceived = CardAPI.getAllCards(filters)
+            while(cardsReceived.isNotEmpty()) {
+                cardList.addAll(cardsReceived)
+                filters[0] = "page=${++page}"
+                cardsReceived = CardAPI.getAllCards(filters)
+            }
+            return cardList
+        }
+
+        fun getAllCards(): List<Card> {
+            return getCards()
+        }
+
+        /**
+         * Get all cards passed date
+         * @param after All cards recieved will be released after this date
+         */
+        fun getAllCards(after: DateTime): List<Card> {
+            var cardList = mutableListOf<Card>()
+            var sets = getAllSets(after)
+            for(set in sets) {
+                cardList.addAll(getCardsInSet(set.code))
+            }
+            return cardList
+        }
+
+
+        /**
+         *
+         */
+        fun getCardsInSet(setCode: String): List<Card> {
+            return getCards("set=$setCode")
+        }
+
+        fun getAllCardTypes(): List<String?> {
+            return CardAPI.getAllCardTypes()
+        }
+
+        fun getAllCardSuperTypes(): List<String?> {
+            return CardAPI.getAllCardSupertypes()
+        }
+
+        fun getAllCardSubTypes(): List<String?> {
+            return CardAPI.getAllCardSubtypes()
+        }
+
+        /**
+         *
+         *
+         * SET API Calls
+         *  - All api calls related to sets
+         *
+         *
+         */
+        fun getSets(vararg extraFilters: String): List<MtgSet> {
+            val setList = mutableListOf<MtgSet>()
+            var page = 1
+            val filters = arrayListOf("page=$page", *extraFilters)
+            var setsReceived = SetAPI.getAllSets(filters)
+            while(setsReceived.isNotEmpty()) {
+                setList.addAll(setsReceived)
+                filters[0] = "page=${++page}"
+                setsReceived = SetAPI.getAllSets(filters)
+            }
+            return setList
+        }
+
+        fun getAllSets(): List<MtgSet> {
+            return getSets()
+        }
+
+        fun getAllSets(after: DateTime?): List<MtgSet> {
+            return getAllSets().filter({
+                val releaseDate = convertStringToDateTime(it.releaseDate)
+                releaseDate?.isAfter(after)!!
+            })
+        }
+
+
+    }
+
+
+}
+
+fun main(args: Array<String>) {
+    val cards = MtgAPI.getAllCards()
+    print(cards)
+}
diff --git a/app/src/main/java/vanderclay/comet/benson/franticsearch/data/db/CardDB.kt b/app/src/main/java/vanderclay/comet/benson/franticsearch/data/db/CardDB.kt
@@ -4,6 +4,4 @@ package vanderclay.comet.benson.franticsearch.data.db
  * Created by gclay on 4/5/17.
  */
 
-class CardDB(val cardDBHelper: CardDbHelper = CardDbHelper.instance, val dataMapper: DbDataMapper = DbDataMapper()) {
-
-}
+class MtgCard
diff --git a/app/src/main/java/vanderclay/comet/benson/franticsearch/data/db/CardDBHelper.kt b/app/src/main/java/vanderclay/comet/benson/franticsearch/data/db/CardDBHelper.kt
@@ -1,8 +1,5 @@
 package vanderclay.comet.benson.franticsearch.data.db
 
-/**
- * Created by gclay on 4/5/17.
- */
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase

diff --git a/app/src/main/java/vanderclay/comet/benson/franticsearch/data/db/DbDataMapper.kt b/app/src/main/java/vanderclay/comet/benson/franticsearch/data/db/DbDataMapper.kt
@@ -1,6 +1,8 @@
 package vanderclay.comet.benson.franticsearch.data.db
 
 /**
+ * This class is used to convert data from the database to a format
+ * usable by the application
  * Created by gclay on 4/5/17.
  */
 

diff --git a/app/src/main/res/layout/item_card_row.xml b/app/src/main/res/layout/item_card_row.xml
@@ -4,7 +4,7 @@
     <data>
         <variable
             name="card"
-            type="vanderclay.comet.benson.franticsearch.API.CardDO"/>
+            type="vanderclay.comet.benson.franticsearch.data.db.CardDO"/>
     </data>
 
     <FrameLayout