split up even more
added some stuff for future usage