Back out this morning's work; count templates better
Replace analyses