Clean up house a bit, another attempt at doing backtracking (a failed one)