Tank refactoring :3