Uniform flow now working, still working on mass consistent splitting