Begin refactor

just ingots for now