Made more general.  Now needs to be sourced.