add TODO's
rename these to something more descriptive