Lots of work still to do, but here we go.
This will be my main site from here on.
Merged conflicts.