Added heaps of stuff including card comparator