WIP
Updated header parser with registers