Debugging again

Nearly there.