seems to work, MUST REMOVE OLD CENSORING FILL-IN
better duration handling!
added comment about caching abstraction
Merge branch 'better-censoring'

Conflicts:
	internals/states.py