bout time this got stashed
pull in current code