Support flowing mode - closes #1