Move more API logic into client class.
Make sure no numbers are called more than once.