Complete Bronze Refactor