More work on Fluid crafting system