First commit for Laboration 3 (code from 1 & 2)