Moved stuff to header