Might have fixed looping bugs.
Merge branch 'feature/intervention' into develop