Spam for comments essentially finished, still some tidying up to be done and cucumber