Merge to Master

Was working in other branch as code was very (and still kind of is) dirty

Game is now playable!