todos
updated from first run learnings
additions from friday