Headers

Copying Alexis's changes and adding headers