starting small :D
small things. Breaks after searching and finding, case-insensitive name matching, etc
added a todo
Merge commit 'da7fbf796ab0be87990709bec57539c926055561' into develop