move more stuff to common