data handling logic done
Merge branch 'master' of https://github.com/diogo149/simbo