adding headers
added tests, working on wonky wrapping