Adding fill world handling for drain

doesn't work at all but the ideal is there at least