in progress do not use
Merge branch 'tim_dev' of https://github.com/tnelson/FlowLog
more safety