Issue ITTE-692

All the tasks. Problem 6 is still incomplete.