Tightened up the documentation
After writing the documentation, I've realized it's not so simple
Added another TODO