@toolness: if you have a quick minute, can you look over my recent commit? If it looks good, I'll proceed with writing the Fb lib tests.