Worked on points 1 and 4 (DI) from #52.
Other points still need work...
Hopef...