as stated previously: I don't like the Node namespace in here - let's move it on level up