Initial work on tutorial 3 and testcases.