Almost working version

Almost working version