More for #30. Work on #26