I think it basically works now...

Still more to come on Sunday.