Moved Tank our of wip