Finished overhauling Duel3

still need updated comments.