Some changes and large portion test coverage. Working on getting visible
player.
Pushing so we're synced
Test