More autonomous stuff

Not everything is working