Yes, indeed! Thanks to Nate at Stouffer Legal for this work.
Being that this is your first foray into NFA (as it was mine), may I suggest seeing them about a trust? They did mine and I couldn't be happier!
Good reminder on the trust, IIUC time is running out so def plan on going that route