added todo, docu