Tasks now split up and using config settings