Added files from handin3