Added the code that Sami and I worked on today.