Use classes for solutions, first on #48