final(?) willie/jake merge