Continue DN parsing/formatting overhaul