Flink 964

This is a cleaned-up version of the already discussed prototype.