update todo, really just expressions left to do