Add new solution

Add new solution that attempts to fix some of the shortcomings from the
previous.