first
fixing merging
getting rid of old stuff
changes