Added more content to the original. More work needed, of course.