Working copy. Tidying up left.