Fix enchants?
Progress commit