Refactored and back to working order for 1 player selection. Two player selection isn't working however