More API added. Now for the real work, I fear