More merging changes for Sprint 3 (build/save player) -sadean