Friday
started making table
merging