Added some comments and todos Also, I promise I'll stop working on
master from now on.