Added remaining part of handin 1