Tidying up, and getting it working again