most of the tasks done, just analytics missing