Excerpted some useful functionality to a new assembly