First pass at #374