First pass on #384