Merged tankbase and tank
more merging