Add Card functionality, various improvment to gameplay flow