Further work on Fluid I/O

Signed-off-by: Sunstrike <sunstrike@azurenode.net>