Started auto
Added functions for actions
Fixed merge conflicts