Starting some Game Logic
merged master