Removing code duplication, fixing issues from the previous merge, getting player state sync all working properly