Fix the tank classes. They are boring as hell!