Weapons now in separate file