Should really automate this
New Playertracker, Fixes #5. Additionally some more consistency for Client and Server