add initial update awards implementation
Merge branch 'master' into awards
implement more awards WIP
Merge branch 'awards'