Etracker event tracker

Implemented but must be tested