checkpoint with substantial venn diagram progress
general cleanup