Added Pump block, started work on fluid block discovery. Discovery function(s) still not working correctly.