Still moving common stuff to header.