Many changes, added player and buttons and part of functionality