Drawing on direct content moved out into new class. Some refactoring of construction of dawning commands.