Added stuff from previous lab day /vrutberg