Partially converted code to new fluid object
* OP and Fickian work together
* Fluiding pairings work
* Occupancy works