migrate to class model
refactor for today
refactor
n/a