First attempt at revising doInstead etc.
Removed long form remapping and added fluidName
Removed getDobj and getIobj methods