@jreback where should this be moved to?