Making progress on the Warlock II restoration