First pass at #170