Updated description and added TODO
Added analytics