Cards complete

TODO - Cards delete => need some discussion