Tested and working

See pics for details