Sentinel support

Was #452.
ah, duh, sorry missed that