Intermediate commit on my way to get a testable tank