Refactor from old stuff to fit new needs
some random stuff