Started initial work on headers