Most of main class now uses player