Initial patch with working WordIndex