Model changed According to Lecture Model

TODO's staan in het model