Fixed base gameplay

Fixed the base gameplay, now it's all working as supposed to be!