Revert "Revert "MASSIVE OVERHAUL to header and register""

This reverts commit 9adadb36d304d071f5d2f5b061ba8b9b5d420c82.