Feature/header

Header bits are now completed