Hmm.
Tidying up, debugging.