Working on porting fluid.c to SoA