Merge pull request #44 from jesseflorig/florigDev

3x times in a row!
update
Initial Search cleanup