add Control class, change Navigation signature