add lots of TODO's