adds tracker feature #117