Started flow separated code; have not gotten it to compile yet.