Sorta working
Merge branch 'master' of github.com:ExFideFortis00/thanks_gerald_app