[KLS]

I didn't even see this last post but yeah I went through tonight and double checked things and basically came out with that code (doh duplication of effort).

I've tested it and it seems to work right which is encouraging. It's on master now.