Sharing upstream

Sharing work done on this project at $DAYJOB. :-)