add TODO list
attempt to fix immediate problems
more TODO items