Wip review

Don't merge yet. Tests are broken.