17th commit.
All parts are done, except the IndexWriter.
NEED DEBUG!