not rock-solid looking, but seems to be on the right track.