Add rudimentary roaming logic and clean up driving a bit