Ugh... hard-coded initial data.
Merge branch 'new'