factor out shuttle controller to its own class, new design