This closes #33

Had to add a table model