Rewrite of the environmental accumulator, closes #60