@carlw In my rewrite there is a lot less conditionals / logic. I think this is very important - the idiomatic ways of doing this actually reduses the complexity a lot. Even the LOC went from 94 to 58, and I even added a couple of convenience functions in the ViewModel. Fewer scenarios can cause bugs here IMO.