Revised autonomous

Some changes that should definitely be merged