Fixed naming conventions, added beginning of conversation support