front: Expanded diagnostics, separated some utilities into new class.