Base game near finished
Bug fxing