Incorporate Oliver's simple fluid dynmaics simulator