I'll add this to a ticket since it is a pattern we will want to use in other places.