Almost working version

ah......