Initial problem 27 commit needs finishing.