Continuing to break up functions
Delete old navigator since all logic has been extracted