working basics
Merge branch 'master' of https://github.com/dhafirnz/findly-common