First working version of subs tracking integration