WIP: Bring in cards with some hacks

/cc @commuterjoy