First pass at #212