(WIP) porting to new libflo