First pass at #119