First pass at #178