Problem 85 solved, needs refactor