I wanted to see if I could do it incrementally by first adjusting the model. I'm taking a closer look at all these TODOs to see which ones are absolutely mandatory.