Merged most things. Bullets still not in