Feature/add additional automation

Opening pull request to start conversation.