Changed model to be simpler until ui is finalized