move stuff to config