General updates and inital tracker code