Refactoring and finished adding waist measurement