Revert 95a50be..c9e5169

This rolls back to commit 95a50beec0e3dc663a040f3ff9881bda06855a69.
Updated some card class skeletons
Fixed conflict