merge with WIP flags + flag test 0.1