More basline work.
Fixed merge conflicts.
Select work, tightening a few things up.