Refactored code so it would fit the new TowerHolder
Merge