Exactly. When the 2nd was drafted, we already had an army, viz. the Continental Army. The "militia" was separate from that. The "militia" was an armed citizenry, armed with the same weapons as government troops.
The gun control acts of '34, '68, and '86 have largely neutered the Founding Father's intent.