Start of assignment 7 (DI)
Remove loading of coder model (not present yet)
Merged starting point of assignment 6
Manual cherry pick from previous assignment