More (unfinished) automation tasks