JNN October 22nd stuff

see commit history