Initial changes to Poker to use the new Viewport