Added lots of TODO's