merge
more scratchwork