Modjam4: last commit before building

This committed and opushed off stream, but only contains changes made on stream.