Refactored and got everything but showdown