Simplify Game logic a bit + some advances on Chakart