Tank stacking fix. Intended to fix #9

This should fix bug #9
Some work still needs to be done here, but this is gamma release.