Started refactor of NTalk - WIP