Progress on my Yoroi