Enyo 3743

Ok here it comes again!  think i got it this time merge the wrong branch in to mine and had to do a littel rework
john