moving around header definitons and getting x86 closer
revert back a few things