Move more stuff from wagn to card, main generator working now