FIXED TODO's and externalize player and display