Revert "Revert "code merge Gunnar en Jaimy""

This reverts commit 4f313007826ef5fa10ab762921c2682c606eca15.
Revert "Revert "Revert "code merge Gunnar en Jaimy"""

This reverts commit f44efccbe264f6da3fa984d77d58efed2885c0c5.