Thank you for playing! Yes I plan on implementing one button for both. Yes Maybe having s and w not switch might make more sense.