Added some parameters for current tank. Partial work on #16