Gun safety to be taught soon