Started to move ID & Data to API in preparation of rewriting Guessing