move some things around
added file for @wouterramaker