now more.........

and more TODOs.