Did some work
started working on a file that combines the two working trees