Version 3 now working; added player and tests