strucktur fertig + TODOs added