Implement a simple tracking mechanism
0.5.0