a little progress...
Attempting merge.