Started work on adding response headers (pending far too long). Not complete yet