NavContext partially fixed. Need some more action.
Interface yet again. TODO: remove code duplication, try to make a class.