refactored to work
HeightCalc refactor complete