done the refactoring, starting to decomplect this thingy :D