Yeah, understood. I was focused on DRYing up code and surrounding as much of it with specs as possible. That is a pattern used with tenants and users as well. We should probably try and determine why that was designed that way.