Progress in reactivenav refactoring