Would be nice to have this tied into rewst