Started working on weapons, too