Actually works (in testing) with new config and signals!