"Fix" TODO's
Update deployment tracking to use newest endpoint