Added cards config file. Will merge and begin writing cards tests
fixed merge conflicts