Filled in some cards, updated helpers