Tidied up xml feed this is more or less finished but ugly and needs tests