Tasks 5.1-4, 5.6, 6.1-3 done