next generation

full metal refactor