Solution 96 Refactored

Solution should be soon.