buggy jumping off point
Revised logic---new stopping criteria
Merge branch 'chris' into Jameson