work on #19 part-baked