WIP Fixup registry specs
WIP Remove Struct definition
WIP Remove unused methods
WIP Editing works :)