Images and players now use classes