diff --git a/projects/mtg/include/GridDeckView.h b/projects/mtg/include/GridDeckView.h
index 6eb2ec104..27911cd99 100644
--- a/projects/mtg/include/GridDeckView.h
+++ b/projects/mtg/include/GridDeckView.h
@@ -13,205 +13,21 @@ private:
         SCROLL_TO_SELECTED
     };
 
-    static const float scroll_speed = 5.0f;
-    static const float card_scale_small = 0.48f;
-    static const float card_scale_big = 0.6f;
+    static const float scroll_speed;
+    static const float card_scale_small;
+    static const float card_scale_big;
 public:
-    GridDeckView(): DeckView(16), mCols(8), mRows(2), mSlide(0), mScrollOffset(0), mCurrentSelection(0), mColsToScroll(0), mStage(NONE)
-    {}
+    GridDeckView();
+    virtual ~GridDeckView();
+    void Reset();
 
-    virtual ~GridDeckView()
-    {}
+    void UpdateViewState(float dt);
+    void UpdateCardPosition(CardRep &rep, int index);
 
-    void Reset()
-    {
-        mSlide = 0;
-        mScrollOffset = 0;
-        mCurrentSelection = 0;
-        mColsToScroll = 0;
-        mStage = NONE;
-    }
-
-    void UpdateViewState(float dt)
-    {
-        switch(mStage)
-        {
-        case SCROLL_TO_SELECTED:
-            if(mColsToScroll < 0){
-                mScrollOffset -= dt * scroll_speed;
-                if(mScrollOffset <= -1.0f)
-                {
-                    mScrollOffset += 1.0f;
-                    deck()->next();
-                    deck()->next();
-                    mCurrentSelection = (mCurrentSelection >= 6) ? mCurrentSelection - 2 : -1;
-                    reloadIndexes();
-                    mColsToScroll += 1;
-                }
-            }else if(mColsToScroll > 0){
-                mScrollOffset += dt * scroll_speed;
-                if(mScrollOffset >= 1.0f)
-                {
-                    mScrollOffset -= 1.0f;
-                    deck()->prev();
-                    deck()->prev();
-                    mCurrentSelection = (mCurrentSelection >= 0 && mCurrentSelection < 10) ? mCurrentSelection + 2 : -1;
-                    reloadIndexes();
-                    mColsToScroll -= 1;
-                }
-            }else if(mColsToScroll == 0){
-                mScrollOffset = 0;
-                mStage = NONE;
-            }
-            dirtyCardPos = true;
-            break;
-        case SLIDE_DOWN:
-            mSlide -= 0.05f;
-            if (mSlide < -1.0f)
-            {
-                dirtyFilters = true;
-                mSlide = 1;
-            }
-            else if (mSlide > 0 && mSlide < 0.05)
-            {
-                mStage = NONE;
-                mSlide = 0;
-            }
-            dirtyCardPos = true;
-            break;
-        case SLIDE_UP:
-            mSlide += 0.05f;
-            if (mSlide > 1.0f)
-            {
-                dirtyFilters = true;
-                mSlide = -1;
-            }
-            else if (mSlide < 0 && mSlide > -0.05)
-            {
-                mStage = NONE;
-                mSlide = 0;
-            }
-            dirtyCardPos = true;
-            break;
-        default:
-            mStage = NONE;
-            break;
-        }
-    }
-
-    void UpdateCardPosition(CardRep &rep, int index)
-    {
-        int col = index / mRows;
-        int row = index % mRows;
-        float colWidth = SCREEN_WIDTH_F / (mCols - 3);
-        float rowHeight = SCREEN_HEIGHT_F / mRows;
-
-        rep.x = (col + mScrollOffset) * colWidth       - colWidth;
-        rep.y = row * rowHeight + mSlide*SCREEN_HEIGHT + rowHeight/2;
-
-        if(mCurrentSelection == index)
-        {
-            rep.scale = card_scale_big;
-            if(row == 0){
-                rep.y += rowHeight * (card_scale_big - card_scale_small);
-            }else{
-                rep.y -= rowHeight * (card_scale_big - card_scale_small);
-            }
-        }else{
-            rep.scale = card_scale_small;
-        }
-    }
-
-    void Render()
-    {
-        for(int i = 0; i < int(mCards.size()); ++i)
-        {
-            WResourceManager::Instance()->RetrieveCard(getCardRep(i).card);
-
-            if(mCurrentSelection != i)
-            {
-                renderCard(i, 255);
-            }
-        }
-
-        if(2 <= mCurrentSelection && mCurrentSelection < 12){
-            renderCard(mCurrentSelection, 255);
-        }
-    }
-
-    MTGCard * Click(int x, int y)
-    {
-        int n = getCardIndexNextTo(x, y);
-        DebugTrace("Clicked: " << n);
-        last_user_activity = 0;
-
-        //clicked active card, and no animation is running
-        if(n == mCurrentSelection && mStage == NONE)
-        {
-            return getActiveCard();
-        }
-        else if(n < 4 && mStage == NONE)
-        {
-            mColsToScroll = 1;
-            mStage = SCROLL_TO_SELECTED;
-        }
-        else if(n >= 12 && mStage == NONE)
-        {
-            mColsToScroll = -1;
-            mStage = SCROLL_TO_SELECTED;
-        }
-        else
-        {
-            mCurrentSelection = n;
-            dirtyCardPos = true;
-        }
-
-        return NULL;
-    }
-
-    bool Button(Buttons button)
-    {
-        switch(button)
-        {
-        case JGE_BTN_LEFT:
-            mColsToScroll -= 1;
-            mStage = SCROLL_TO_SELECTED;
-            last_user_activity = 0;
-            break;
-        case JGE_BTN_RIGHT:
-            mColsToScroll += 1;
-            mStage = SCROLL_TO_SELECTED;
-            last_user_activity = 0;
-            break;
-        case JGE_BTN_UP:
-            mStage = SLIDE_UP;
-            SwitchFilter(1);
-            last_user_activity = 0;
-            break;
-        case JGE_BTN_DOWN:
-            mStage = SLIDE_DOWN;
-            SwitchFilter(-1);
-            last_user_activity = 0;
-            break;
-        default:
-            return false;
-        }
-        return true;
-    }
-
-    MTGCard *getActiveCard()
-    {
-        if(mCurrentSelection >= 0 && mCurrentSelection < int(mCards.size()))
-        {
-            return mCards[mCurrentSelection].card;
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-    //maintains the current rotation for fluid animations
+    void Render();
+    MTGCard * Click(int x, int y);
+    bool Button(Buttons button);
+    MTGCard *getActiveCard();
 private:
     int   mCols;
     int   mRows;
diff --git a/projects/mtg/src/GridDeckView.cpp b/projects/mtg/src/GridDeckView.cpp
index cb81a0065..774cb9ca1 100644
--- a/projects/mtg/src/GridDeckView.cpp
+++ b/projects/mtg/src/GridDeckView.cpp
@@ -1 +1,204 @@
 #include "GridDeckView.h"
+
+const float GridDeckView::scroll_speed = 5.0f;
+const float GridDeckView::card_scale_small = 0.48f;
+const float GridDeckView::card_scale_big = 0.6f;
+
+GridDeckView::GridDeckView()
+    : DeckView(16), mCols(8), mRows(2), mSlide(0), mScrollOffset(0), mCurrentSelection(0), mColsToScroll(0), mStage(NONE)
+{
+
+}
+
+GridDeckView::~GridDeckView()
+{
+
+}
+
+void GridDeckView::Reset()
+{
+    mSlide = 0;
+    mScrollOffset = 0;
+    mCurrentSelection = 0;
+    mColsToScroll = 0;
+    mStage = NONE;
+}
+
+void GridDeckView::UpdateViewState(float dt)
+{
+    switch(mStage)
+    {
+    case SCROLL_TO_SELECTED:
+        if(mColsToScroll < 0){
+            mScrollOffset -= dt * scroll_speed;
+            if(mScrollOffset <= -1.0f)
+            {
+                mScrollOffset += 1.0f;
+                deck()->next();
+                deck()->next();
+                mCurrentSelection = (mCurrentSelection >= 6) ? mCurrentSelection - 2 : -1;
+                reloadIndexes();
+                mColsToScroll += 1;
+            }
+        }else if(mColsToScroll > 0){
+            mScrollOffset += dt * scroll_speed;
+            if(mScrollOffset >= 1.0f)
+            {
+                mScrollOffset -= 1.0f;
+                deck()->prev();
+                deck()->prev();
+                mCurrentSelection = (mCurrentSelection >= 0 && mCurrentSelection < 10) ? mCurrentSelection + 2 : -1;
+                reloadIndexes();
+                mColsToScroll -= 1;
+            }
+        }else if(mColsToScroll == 0){
+            mScrollOffset = 0;
+            mStage = NONE;
+        }
+        dirtyCardPos = true;
+        break;
+    case SLIDE_DOWN:
+        mSlide -= 0.05f;
+        if (mSlide < -1.0f)
+        {
+            dirtyFilters = true;
+            mSlide = 1;
+        }
+        else if (mSlide > 0 && mSlide < 0.05)
+        {
+            mStage = NONE;
+            mSlide = 0;
+        }
+        dirtyCardPos = true;
+        break;
+    case SLIDE_UP:
+        mSlide += 0.05f;
+        if (mSlide > 1.0f)
+        {
+            dirtyFilters = true;
+            mSlide = -1;
+        }
+        else if (mSlide < 0 && mSlide > -0.05)
+        {
+            mStage = NONE;
+            mSlide = 0;
+        }
+        dirtyCardPos = true;
+        break;
+    default:
+        mStage = NONE;
+        break;
+    }
+}
+
+void GridDeckView::UpdateCardPosition(CardRep &rep, int index)
+{
+    int col = index / mRows;
+    int row = index % mRows;
+    float colWidth = SCREEN_WIDTH_F / (mCols - 3);
+    float rowHeight = SCREEN_HEIGHT_F / mRows;
+
+    rep.x = (col + mScrollOffset) * colWidth       - colWidth;
+    rep.y = row * rowHeight + mSlide*SCREEN_HEIGHT + rowHeight/2;
+
+    if(mCurrentSelection == index)
+    {
+        rep.scale = card_scale_big;
+        if(row == 0){
+            rep.y += rowHeight * (card_scale_big - card_scale_small);
+        }else{
+            rep.y -= rowHeight * (card_scale_big - card_scale_small);
+        }
+    }else{
+        rep.scale = card_scale_small;
+    }
+}
+
+void GridDeckView::Render()
+{
+    for(int i = 0; i < int(mCards.size()); ++i)
+    {
+        WResourceManager::Instance()->RetrieveCard(getCardRep(i).card);
+
+        if(mCurrentSelection != i)
+        {
+            renderCard(i, 255);
+        }
+    }
+
+    if(2 <= mCurrentSelection && mCurrentSelection < 12){
+        renderCard(mCurrentSelection, 255);
+    }
+}
+
+MTGCard * GridDeckView::Click(int x, int y)
+{
+    int n = getCardIndexNextTo(x, y);
+    DebugTrace("Clicked: " << n);
+    last_user_activity = 0;
+
+    //clicked active card, and no animation is running
+    if(n == mCurrentSelection && mStage == NONE)
+    {
+        return getActiveCard();
+    }
+    else if(n < 4 && mStage == NONE)
+    {
+        mColsToScroll = 1;
+        mStage = SCROLL_TO_SELECTED;
+    }
+    else if(n >= 12 && mStage == NONE)
+    {
+        mColsToScroll = -1;
+        mStage = SCROLL_TO_SELECTED;
+    }
+    else
+    {
+        mCurrentSelection = n;
+        dirtyCardPos = true;
+    }
+
+    return NULL;
+}
+
+bool GridDeckView::Button(Buttons button)
+{
+    switch(button)
+    {
+    case JGE_BTN_LEFT:
+        mColsToScroll -= 1;
+        mStage = SCROLL_TO_SELECTED;
+        last_user_activity = 0;
+        break;
+    case JGE_BTN_RIGHT:
+        mColsToScroll += 1;
+        mStage = SCROLL_TO_SELECTED;
+        last_user_activity = 0;
+        break;
+    case JGE_BTN_UP:
+        mStage = SLIDE_UP;
+        SwitchFilter(1);
+        last_user_activity = 0;
+        break;
+    case JGE_BTN_DOWN:
+        mStage = SLIDE_DOWN;
+        SwitchFilter(-1);
+        last_user_activity = 0;
+        break;
+    default:
+        return false;
+    }
+    return true;
+}
+
+MTGCard* GridDeckView::getActiveCard()
+{
+    if(mCurrentSelection >= 0 && mCurrentSelection < int(mCards.size()))
+    {
+        return mCards[mCurrentSelection].card;
+    }
+    else
+    {
+        return NULL;
+    }
+}