refactor mapping
make sure to cache search
Merge branch 'master' of https://github.com/digitalWestie/clackskids