added some ToDo´s and methodes