Added a card model, made a few small changes to the task model