First commit from oliver on computer 22