Almost done with the new analyzer stuff