Fleshed out Tracker stuff

Still a few things need ironing out