barring a few todos, it looks like it works.