First actual play test.

Let's see how this deals with merges and other such things.