Rebased basic game version

It's a start point for future buildup.