A shit load of changes
Merge branch 'development' of https://github.com/kishandchips/major-talent into development