Refined Earlier Autonomous

New stuff to move around.