Added Bjorn's code for lab1