And the solution was staring me in the face