Human Player upgrade
Merge
Merge again?
Revert "Merge again?"

This reverts commit 2b369c2f45987ab0f40c5bcf63a2057e06bfe8b9.
Revert "Merge"

This reverts commit ce67a46d9bbb587e4215445505d9711ece64ed42.