Add more fake stops, move to controller