Tested and working

Please see pictures