Mbriskar windup 222 - Rebased and tests passing