refactor so code isn't duplicated
refactor again
use since
merge with datespan-default