Depending on availability of a friend's shop I hope to get the rivets soldered in this week. On another note, I realized the magazine plug I intended to use is for a M97 and isn't compatible. It's an original so I hope it may not be too hard to find a trade for M12 plug. I'll try a notice in the classified.