Partial work, just switching to my desktop :]

[ci skip]