mattdrayer/master: Added comments and a bit more impl