Further work: Fluid system and state preservation.
Some extras, too.

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