moved stuff into header