Saturday’s marathon floor session determined that the gun and school security proposal Senators will vote on today will not contain an assault weapons ban, a firearms registry, a ban on high-capacity magazines, an elimination of a state law that prevents cities and counties from passing gun control ordinances, and a requirement that people who want a concealed weapons permit first get a mental health evaluation.

But Senators did vote on making it illegal for people to possess bump stocks.

SB 7026 will impose a new three-day waiting period for all firearms and extending that wait period if a background check is not completed; raises the minimum age to purchase a rifle or shotgun from 18-21 (the restriction already applies to handguns); bans the sale of bump stocks, provides mental health money to serve at-risk children; develops a mobile app called “Fortify Florida” for students, parents, teachers and others to forward tips on suspicious activity -- anonymously; and, the most controversial, creates the “marshal program” that allows school districts, if they choose, to allow teachers to arm themselves if they undergo 132 hours of training for the purpose of responding to an active shooter. They also must take 12 hours of diversity training.

If Senators approve the bill, it then moves to the House, which would vote on it Wednesday.