Change the way the cards work and added EE3 support.