Refact to not use DB
Merge branch 'master' of https://github.com/joaomsa/hackathon