connerbranch mark 1, or 2, or maybe 3
merge and delete all
add everything