Readding work that was done on classlab8-solution