Pluggable drift

Code for preliminary review and discussion.