11. Added stuff!

Still to do: Test everithing! Task 12.