2nd commit, all files tested ok against complete forum data set