Code refactored, Player functionality in place