PULL working - some more cleanup required