Big tweaks to headers, almost there