almost finished uppgift 2