academy stuff
Merge branch 'master' into academy
done more academy work
Merge branch 'master' into academy