Tank baby redux.
Looks good, will merge it after I finish not adding JS into twine properly.
merged
mentioned in commit 955d725f
