Lets talk about this more. I'm up for any changes that will make this aspect cleaner. I'm thinking this would be a good one to handle separately as a refactor to make a subsequent review easier.