move stuff to Common