merged all work except evaluator
merged all functionalities. Also added functionality to log click data