Still fixing gameplay