Refactors, add tanks