Major commit to simpler solution.