Add some progress... still not completly working