More progress on the E. Marshall style Rifle Lock