Work on debugging some more