Initial Crack at implementing the new API -- very slow at getting results.