Add TODOs for tackling this tomorrow.