Checking in for the night

Ongoing debug work