Further Header const
Header const mostly complete