Attempted to integrate more header stuff