complete re-architecture, moved to 'navigator' concept