dates show up on the initial calculation. still need to refactor