Even more work and cleaning up on the API Link