Initial find-a-solution commit