First pass at #118