Working on getting items more condensed.

Also added weapons.