Moved all in to Objects, Added Player icons and player switches