Allow for structural tanks.

Allows structural tanks
Some refactoring of code.