More work on new automation, this is a fucking PITA...