Adding the 2nd Amendment to what is in post 6, and doing away with all CHL requirements. The 2nd is enough. Add criminal penalties. Maybe ban carry in K through 12 schools, courthouses and such but allow unfettered open or concealed carry by any who can legally own a firearm, knife, spear, sword or axe. In essence constitutional carry, not conditional carry.
But preserving individual property rights, though, so individual property owners can decide for themselves whether to allow carry on their property?