Changes and some header work