More code, still very early days.
Various updates and fixes, heading in the right direction.