Sentinel support

Was #452.
:+1: