First attempts at getting the extra headers in place