Added stuff from Tut 10-12

12 doesn't work yet