First commit

flattens some of the single select, so far