topic selection implemented
resolved conflicts post merging new code