header stays put. starting to tidy things up a bit.
resolving conflicts