#23: Added pistol and first weapon class.