First working version
removing crap