He has the chance to acquit himself in combat before the episode is over. But yes, the original intent is for him to smith weapons.

These are really good points (imo).

Yea I get that.

This. Also the weight on the scene where Davos sent Doloros Edd out to get the Wildlings. Maybe it's my hopeful imagination but it seemed like they lingered heavily on the words there for a bit.

I feel strongly that Mance Rayder being alive is coming this season. That's my prediction. Foreshadowed strongly in this episode.

Link? This I would like to see.