repushing jacks code in case it got messed up in merge conflicts etc #64

Closed cstasney closed 10 months ago