Some more backend progress.