Lots more docblocks, but still not done.