Getting some of the headers working better.   Things are a lot smoother and easier to create with the new system in place