Adding more options and a more advanced player