First pass at #272