Fixed data model, updated Create New Card to be mostly functional