completes assignment 3, kap 4

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
completes assignment 4, kap 4

Signed-off-by: Alexander Skjolden <alex@plastboks.net>