First cut at inclusion of the two swords subplot