Acid2

Reviews addressed. re-r? @larsbergstrom et al