Fleshed out Automate class a lot more