Started separating view and game