Tracking options added, still buggy at the moment.