merging work so far

I think this should work