Cards 2.0 rewrite