Merge branch 'tiers'
Merge remote-tracking branch 'main/master'
Modified network protocol slightly in order to reflect wiki