Added task 16 stuff (does not work yet).