merge attempt to maintain one branch
Chiwi named, search not working yet
attempting to merge github version + desktop version