Revert "MASSIVE OVERHAUL to header and register"

This reverts commit 344c3a0b45cd21abd3b58b1044bf3164f4e2b0cf.