finishing integrating the new card stack stuff