Tasks 8.6, 8.7, 9.1 done