basic flow set, about to make it work
Merge branch 'christopher'