Get DELIV-IMG working. Tests pass. Start refactoring.