Goede versie
Updated Data class
...
after merge
final
Fixed merge conflicts