1st round of debugging...