rearrange stuff, add pistol