Working!

some more changes to do