Finish fleshing out the logical model