Initial stab on an improved embedding. This is a mid-stream
checkin. More to come.