Finished refactor of NTalk