removed old stuff
working it out