Windup 155

Not ready to merge -- looking for some feedback...