Getting this thing done, header stuff mostly still