Worked on this today.