refactor attempt
NameMagic refactor